项目立项申请接口

src/api/userApi.js

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

src/views/messageNotification.vue

@@ -195,7 +195,7 @@
           this.ajax
               .post(this.$store.state.api+"/DeleteNotification",param)
               .then(res=>{
-                  console.log(res);
+                  // console.log(res);
                   this.getCourseManagement()
                   this.dialogVisible1=false;
                   
@@ -232,11 +232,11 @@
               title:this.addMess.tit,
               brief:this.addMess.con,
             }
-            console.log(param)
+            // console.log(param)
             this.ajax
                 .post(this.$store.state.api+"/CreateNewNotification",param)
                 .then(res=>{
-                    console.log(res);
+                    // console.log(res);
                     this.dialogVisible=false;
                     this.addMess.tit='';
                     this.addMess.con='';
@@ -255,8 +255,8 @@
           this.ajax
           .get(this.$store.state.api+'/SelectNotificationDetail',param)
           .then(res=>{
-              this.messageCon=res.data.data
-              console.log(res);
+              this.messageCon=res.data
+              // console.log(res);
           },err=>{
             console.log(err);
           })
@@ -278,17 +278,13 @@
               .get(this.$store.state.api+'/SelectNotification',param)
               .then(res=>{  
                 // 不是在第一页进行分页请求，请求数据为空，再发送一次请求获取数据,判断是否为第一页，防止无限循环
-                console.log(res)
-                if(this.table.currentPage!==1 && res.data.data[0].length==0){
+                // console.log(res)
+                if(this.table.currentPage!==1 && res.data[0].length==0){
                   this.table.currentPage=1
                   this.getCourseManagement();
                 }
-                this.tableData=res.data.data[0];
-                this.table.total=res.data.data[1][0].total;
-                // console.log(this.table)
-                // console.log(res.data);
-                // this.items=res.data[1]
-                // this.table.total=res.data[0][0].total
+                this.tableData=res.data[0];
+                this.table.total=res.data[1][0].total;
               },err=>{
                 console.log(err);
               })

src/views/projectApply/projectApplication.vue

@@ -11,9 +11,9 @@
     <div class="selects">
       <div class="selectsBlock">
         <div class="selectLabel">项目筛选</div>
-        <el-select v-model="pavalues.value" placeholder="我的项目">
+        <el-select v-model="selectInp.filter" placeholder="我的项目">
           <el-option
-            v-for="item in options"
+            v-for="item in options.projectFilter"
             :key="item.value"
             :label="item.label"
             :value="item.value">
@@ -23,9 +23,9 @@
 
       <div class="selectsBlock">
         <div class="selectLabel">部门</div>
-        <el-select v-model="pavalues.value1" placeholder="请选择">
+        <el-select v-model="selectInp.department" placeholder="请选择">
           <el-option
-            v-for="item in options1"
+            v-for="item in options.department"
             :key="item.value"
             :label="item.label"
             :value="item.value">
@@ -35,9 +35,9 @@
 
       <div class="selectsBlock">
         <div class="selectLabel">分类</div>
-        <el-select v-model="pavalues.value2" placeholder="请选择">
+        <el-select v-model="selectInp.sort" placeholder="请选择">
           <el-option
-            v-for="item in options2"
+            v-for="item in options.sort"
             :key="item.value"
             :label="item.label"
             :value="item.value">
@@ -47,9 +47,9 @@
 
       <div class="selectsBlock">
         <div class="selectLabel">负责人</div>
-        <el-select v-model="pavalues.value3" placeholder="请选择">
+        <el-select v-model="selectInp.person" placeholder="请选择">
           <el-option
-            v-for="item in options3"
+            v-for="item in options.person"
             :key="item.value"
             :label="item.label"
             :value="item.value">
@@ -59,9 +59,9 @@
 
       <div class="selectsBlock">
         <div class="selectLabel">状态</div>
-        <el-select v-model="pavalues.value4" placeholder="请选择">
+        <el-select v-model="selectInp.state" placeholder="请选择">
           <el-option
-            v-for="item in options4"
+            v-for="item in options.state"
             :key="item.value"
             :label="item.label"
             :value="item.value">
@@ -80,11 +80,13 @@
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         @selection-change="handleSelectionChange">
+        <!-- selection-change批量选择功能后续可能用到 -->
 <!-- 
         <el-table-column
           type="selection"
           width="25"
           >
+
         </el-table-column> -->
         <el-table-column
           prop="projectName"
@@ -146,7 +148,7 @@
                     <!-- <el-link class="btt" type="primary" :underline="false"> -->
                         <el-button type="primary"  size="mini" @click="paApply">查看详情</el-button>
                         <el-button type="primary"  size="mini" @click="audit">{{(status==-1?"审核": status?"撤回":"审核")}}</el-button>
-                        <el-button type="primary"  size="mini" @click="edit(scope)" >申请表</el-button>
+                        <el-button type="primary"  size="mini" @click="appTable(scope)" >申请表</el-button>
                         <el-button type="primary"  size="mini" @click="del">删除</el-button>
                       <!-- </el-link> -->
                   <!-- </el-button> -->
@@ -269,22 +271,25 @@
 </template>
 
 <script>
-import axios from 'axios';
 
     export default {
       data() {
         return {
+          iid:'',
           textarea:'',
           input:'',
           status:-1,
           dialogVisible:false,//立项审核
           dialogVisible1:false,//立项撤回提交
           dialogVisible2:false,//删除
-          options:[],//项目筛选
-          options1:[],//部门
-          options2:[],//分类
-          options3:[],//负责人
-          options4:[],//状态
+         
+          options:{
+            projectFilter:[],//项目筛选
+            department:[],//部门
+            sort:[],//分类
+            person:[],//负责人
+            state:[],//状态
+          },
           tableData:[{
             projectName:'陆地游泳辅助器',
             projectPerson:'王多鱼',
@@ -295,36 +300,24 @@ import axios from 'axios';
             state:'已审核',
           },
           ],
-          // 头部搜索框的内容
-          pavalues:{
-            value:'',
-            value1:'',
-            value2:'',
-            value3:'',
-            value4:'',
+          
+          selectInp:{  // 头部搜索框的内容
+            filter:'',
+            department:'',
+            sort:'',
+            person:'',
+            state:'',
           }
         }
       },
       methods:{
-        getAccountListByPage(){
-
-              //  axios.post(this.$store.state.api+"/a",{}).then(res=>{
-              //   console.log(res)
-              //  })
-               this.ajax
-                    .get()
-                    .then(res=>{
-
-                    },err=>{
-                      console.log(err);
-                    })
-        },          
-        init(){
+             
+        init(){   
           this.dialogVisible=false;
           this.dialogVisible1=false;
           this.dialogVisible2=false;
         },
-        audit(){
+        audit(val){      //审核按钮
           if(this.status==-1){
             this.dialogVisible=true;
             return
@@ -335,65 +328,87 @@ import axios from 'axios';
             this.dialogVisible=true;
           }
         },
-        edit(){
+        appTable(val){   //查看申请表
           
         },
-        commit(){
+        commit(val){    //立项审核对话框里面的确定提交按钮
           this.dialogVisible=false;
           this.status=1
           console.log(this.status);
         },
 
-        commit2(){
+        commit2(val){   //立项撤回对话框里面的确定撤回按钮
           this.dialogVisible1=false;
           this.status--
           console.log(this.status);
         },
 
-        handleSelectionChange(val) {
+        handleSelectionChange(val) {   //批量选择功能后续可能用到 
           console.log(val);
           this.multipleSelection = val;
         },
-        paApply(){
+        getOption(){    //获取下拉框的值
+          let param={
+            uid:this.$store.state.userid
+          }
+          this.ajax
+              .get(this.$store.state.api+'',param)
+              .then(res=>{
+                  console.log(res);
+              },err=>{
+                console.log(err);
+              })
+        },
+        paApply(val){    //查看详情按钮
+          console.log(val);
           this.$router.push('/projectApplicationDetails')
         },
-        apply(){
+        apply(){     //项目立项申请按钮
           this.$router.push('/projectApplicationApplyMain')
         },
-        // 获取下拉框数据
-        getDate(){
-        //   this.ajax    
-        //     .get('/getCreationSelect')
-        //       .then(res=>{
-        //         const p=res.data
-        //         console.log(p);
-        //         this.options=p[0]
-        //         this.options1=p[0]
-        //         this.options2=p[0]
-        //         this.options3=p[0]
-        //         this.options4=p[0]
-        //       },err=>{
-        //         console.log(err);
-        //       })  
+        getData(){    //获取表格数据
+          let param={
+            uid:this.$store.state.userInfo.userid,
+          }
+          this.ajax    
+            .get(this.$store.state.api+'',param)
+              .then(res=>{
+                const p=res.data
+              },err=>{
+                console.log(err);
+              })  
         },
-        del() {
+        del(val) {   //表格删除按钮，点击显示删除对话框
           this.dialogVisible2=true
+          thsi.iid=val    //将要删除的id进行存储供删除对话框使用
         },
-        dialogDel(){
-          this.dialogVisible2=false
+        dialogDel(val){   //确定删除这个项目
+          let param={
+            uid:this.$store.state.userInfo.userid,
+            nid:this.iid
+          }
+          this.ajax
+              .get(this.$store.state.api+"",param)
+              .then(res=>{
+                  console.log(res);
+                  this.dialogVisible2=false
+              },err=>{
+                console.log(err);
+              })
         }
       },
-      watch:{
-          value:{
+      watch:{    //监视选择框的变化，实施刷新表格数据
+          options:{
             handler(){
               immediate:true
               deep:true
-              this.getAccountListByPage()
+              this.getData()
             }
           }
       },
-      mounted(){
-        this.getDate()
+      mounted(){      //跳转到此页面立刻获取数据
+        this.getData();     //获取表格数据
+        this.getOption();   //获取下拉框数据}
       }
 
     }

src/views/projectApply/projectApplication2.vue

@@ -12,7 +12,7 @@
           <!-- 跳转导航开始 -->
           <div class="AppBar">
               <div @click="content">项目基本内容</div>
-              <div @click="remark" class="AppBarActive">项目详情</div>
+              <div class="AppBarActive">项目详情</div>
           </div>
           <!-- 跳转导航结束 -->
 
@@ -77,7 +77,7 @@
       </div>
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary"  @click="backBtn2">立即审核</el-button>
+          <el-button type="primary"  @click="audit">立即修改</el-button>
         </div>
       </div>
   
@@ -96,15 +96,11 @@
           }
         },
         methods:{
-          content(){
+          content(){      //导航栏项目详情跳转
             // alert('111')
             this.$router.push('/projectApplicationDetails')
           },
-          remark(){
-            this.$router.push('/projectApplication2')
-          },
-       
-          backBtn2(){
+          audit(){   //立即审核按钮
             // this.$router.push('/projectApplication')
             this.$message.success('审核成功')
           },
@@ -116,7 +112,7 @@
           }
         },
         created(){
-          this.value=(this.options[0].value)
+          // this.value=(this.options[0].value)
         }
       }
   </script>
@@ -131,7 +127,7 @@
             text-align: left;
             font-size: 18px;
             font-weight: 550;
-            margin-bottom: 10px;
+            margin-bottom: 15px;
             color: #2387ff;
         }
         .PA2textAreaTit2{

src/views/projectApply/projectApplicationApply.vue

@@ -72,7 +72,17 @@
                               <div class="label">预算总经费</div>
                               <el-input v-model="data.select.fund" placeholder="请输入内容"></el-input>
                           </div>
-                          
+                          <div class="inpBlock">
+                              <div class="label">选择分类</div>
+                              <el-select v-model="data.select.sort" style="width: 100%;" placeholder="请选择">
+                                <el-option
+                                  v-for="item in data.sortOptions"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                              </el-select>
+                          </div>
                       </div>
                     </div>
                    
@@ -126,7 +136,7 @@
                   <template #default="scope">
                       <div class="operations">
                           <!-- <el-button type="primary" > -->
-                              <el-button type="primary"  size="mini">修改</el-button>
+                              <el-button type="primary" @click="amendDialogData(scope)" size="mini">修改</el-button>
                               <el-button type="primary" @click="Del(scope)" size="mini">删除</el-button>
                           <!-- </el-button> -->
                       </div>
@@ -208,41 +218,40 @@
 <script>
 
     export default {
-      props:["data","next",'back','addPerson'],
+      props:["data","next",'back','addPerson','amend'],
       data() {
         return {
           input:"",
-         
           addMemberDialog:false,
-
-          
         }
       },
       methods:{
         init(){
           this.addMemberDialog=false
         },
-        addMember(){
+        addMember(){   //添加项目成员
           this.addMemberDialog=true
         },
-
-        // 上一步
-        backBtn1(){
+        amendDialogData(val){   //修改项目成员信息
+            this.addMemberDialog=true
+            this.amend(val)
+        },
+        
+        backBtn1(){  // 上一步
           this.$router.push('/projectApplication')
         },
-         // 下一步
-         backBtn(){
+         
+        backBtn(){   // 下一步
             this.next();
         },
-        commit(){
+        commit(){   //确定添加成员
             this.addPerson();
-            this.init()
+            this.addMemberDialog=false
         },
         Del(){
           
         },
         toPage(val){
-          console.log('111');
             if (val==1) {
               document.getElementById("one").scrollIntoView({ behavior: "smooth" });
             }else if(val==2){

src/views/projectApply/projectApplicationApply3.vue

@@ -186,25 +186,11 @@
 
       <div class="dialogTop">
           <div class="dagSpan">项目名称</div>
-          <el-select style="width: 80%;" v-model="data.dialog.projectName" placeholder="请选择">
-            <el-option
-              v-for="item in data.dialog.nameOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          <el-input v-model="data2.projectName" placeholder="请输入内容"></el-input>
       </div>
       <div class="dialogTop">
           <div class="dagSpan">项目类型</div>
-          <el-select v-model="data.dialog.value" placeholder="请选择">
-            <el-option
-              v-for="item in data.dialog.typeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          <el-input v-model="data2.sort" style="width: 30%;" placeholder="请输入内容"></el-input>
       </div>
 
 
@@ -251,7 +237,7 @@
 import { VueEditor } from "vue2-editor";
     export default {
       // 接收父组件传递回来的方法
-      props:["data","next",'back','submitBtn','addFundDetail'],
+      props:["data","next",'back','submitBtn','addFundDetail','data2'],
       components:{
         VueEditor
       },

src/views/projectApply/projectApplicationApplyMain.vue

@@ -21,9 +21,9 @@
 
       <!--下方内容区开始-->
       <div class="Main_area">
-        <projectApplicationApply :data="projectApplicationApply1" :next="next" :addPerson="addPerson" :back="back" v-show="status==0"/>
+        <projectApplicationApply :data="projectApplicationApply1" :next="next" :addPerson="addPerson" :amend="amend" :back="back" v-show="status==0"/>
         <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-show="status==1"/>
-        <projectApplicationApply3 :data="projectApplicationApply3" :next="next" :addFundDetail="addFundDetail" :back="back" :submitBtn="submitBtn" v-show="status==2"/> 
+        <projectApplicationApply3 :data="projectApplicationApply3" :data2="projectApplicationApply1.select" :next="next" :addFundDetail="addFundDetail" :back="back" :submitBtn="submitBtn" v-show="status==2"/> 
       </div>
       <!--下方内容区结束-->
 
@@ -65,17 +65,18 @@
           return {
             status:0,
             submitHint:false,
-            projectApplicationApply1:{   //立项基础信息
-                select:{
+            projectApplicationApply1:{   //立项基础信息页面
+                select:{    //基本信息数据框
                   projectName:'人工智能分链机器',
-                  person:'',
+                  person:'红发',
                   Data:'2023-3-2',
                   value:"中德学院",
                   fund:'300000',
-                  tel:'',
-                  value1:"2023-11-12"
+                  tel:'13128926474',
+                  value1:"2023-11-12",
+                  sort:'dididi'
                 },
-                options: [{
+                options: [{   //学院下拉框
                     value: '选项1',
                     label: '中德学院'
                   },
@@ -84,59 +85,61 @@
                     label: '中德学院'
                   },
                 ],
-                textarea:'每周星期四为活动时间',
-                Member:{
+                sortOptions: [{   //学院下拉框
+                    value: '选项1',
+                    label: '第一产业'
+                  },
+                  {
+                    value: '选项2',
+                    label: '第二产业'
+                  },
+                ],
+                textarea:'每周星期四为活动时间',   //项目简介
+                Member:{    //添加成员
                     name:'伯邑考',
                     Class:'21通信',
                     phone:'1234567898'
                 },
-                tableData:[{
+                tableData:[{    //成员列表
                     Name:'徐晓慧',
                     Class:'22电子通信G5',
                     tel:'13751177411',
                   },
-                  {
-                    Name:'张扬',
-                    Class:'22电子通信G5',
-                    tel:'13751177411',
-                  },
                 ],
             },
-            projectApplicationApply2:{  //项目内容
+            projectApplicationApply2:{  //项目内容页面
                 contentOne:'',
                 contentTwo:'',
                 contentThree:'',
                 contentFour:'',
                 contentFive:'',
             },
-            projectApplicationApply3:{  //预算经费
-                fund:"1000",
-                // 经费月支出计划
-                tableData:[{
+            projectApplicationApply3:{  //预算经费页面
+                fund:"1000",    //项目总经费
+                
+                tableData:[{      // 经费月支出计划列表数据
                   projectName:'-',
                   date:'2022年11月12日',
                   size:'50k'
                   },
                 ],
-                 // 经费明细
-                tableData2:[{
+                 
+                tableData2:[{  // 经费明细列表数据
                   sort:'人工智能设备购买',
                   Fund:'20000.00',
                   projectName:'项目协作费用',
                   remark:'拨款多多益善'
                   },      
                 ],
-                //对话框
-                dialog:{
-                  textarea:'',
-                  fund:'300000',
-                  content:'',
-                  value: '',   //下拉框
-                  disburseProject:'Al智能生活',
-                  sort:'',
-                  type:'智能家居',
-                  projectName:'Al智能生活',
-                  nameOptions: [ 
+                
+                dialog:{     //经费明细添加对话框
+                  textarea:'小同志不利于团结的话可不兴说呀',  //备注
+                  projectName:'',   //项目名称
+                  projectType:'',   //项目类别
+                  disburseProject:'Al智能生活',  //支出项目
+                  type:'智能家居',  //支出类别
+                  fund:'300000',  //金额
+                  nameOptions: [   //项目名称下拉框
                   {
                     value: '1',
                     label: '疯狂星期四'
@@ -149,8 +152,8 @@
                     value: '3',
                     label: '锻造钢铁'
                   },
-                ],
-                  typeOptions: [ 
+                  ],
+                  typeOptions: [   //项目类型下拉框
                   {
                     value: '1',
                     label: '第一产业'
@@ -163,19 +166,33 @@
                     value: '3',
                     label: '第三产业'
                   },
-                ],
+                  ],
                 },
             }
           }
         },
         methods:{ 
-            addPerson(){  //添加人员
+            addPerson(){  //立项基础信息页面添加人员和修改数据框
               this.projectApplicationApply1.addMemberDialog=false;
               let { name: Name, Class: Class, phone:tel } = this.projectApplicationApply1.Member;
               let data={Name,Class,tel};
               this.projectApplicationApply1.tableData.push(data);
             },
-            addFundDetail(){
+            amend(val){      //立项基础信息页面修改人员信息
+                let param={
+                  uid:this.$store.state.userInfo.userid,
+                  nid:val
+                }
+                this.ajax
+                      .get(this.$store.state.api+'',param)
+                      .then(res=>{
+                        console.log(res);
+                      },err=>{
+                        console.log(err);
+                      })
+                console.log('111');
+            },
+            addFundDetail(){    //预算经费页面经费添加按钮
               let p=this.projectApplicationApply3;
                 let data={
                   Fund:p.dialog.fund,
@@ -185,15 +202,15 @@
                 }
               p.tableData2.push(data)
             },
-            next(){
+            next(){   //顶部导航栏页面下一条跳转
                 if(this.status>=2)return;
                 this.status++;
             },
-            back(){
+            back(){  //顶部导航栏页面上一条
                 if(this.status==0)return;
                 this.status--;
             },
-            submitBtn(){
+            submitBtn(){   //预算经费页面提交按钮
                 console.log("提交啦");
                 console.log(this.projectApplicationApply1,this.projectApplicationApply2,this.projectApplicationApply3);
                 this.submitHint = true;
@@ -201,13 +218,11 @@
             init(){
                 //重置
                 this.projectApplicationApply1.addMemberDialog=false
-                // this.dialogVisible=false;
                 this.submitHint=false;
-                // this.dialogVisible2=false;
             },
 
         },
-        created(){
+        created(){      //实例初始化完成后调用
         //   this.value=(this.options[0].value)
         }
       }

src/views/projectApply/projectApplicationDetails.vue

@@ -12,7 +12,7 @@
     <hr>
     <!-- 跳转导航开始 -->
     <div class="AppBar">
-      <div @click="content" class="AppBarActive">项目基本内容</div>
+      <div class="AppBarActive">项目基本内容</div>
       <div @click="remark">项目详情</div>
     </div>
     <!-- 跳转导航结束 -->
@@ -139,7 +139,7 @@
 
     <div class="baseBtn">
       <div class="blockWidth">
-        <el-button type="primary" class="backBtn" @click="backBtn2">立即审核</el-button>
+        <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button>
       </div>
     </div>
   </div>
@@ -150,8 +150,9 @@
       data() {
         return {
           select:{
-            project:'疯狂星期四',
+            project:'疯狂星期四',   
             person:'袁一鸣',
+            input:"肯德基",  //select框值
             department:[
               {
                 value: '1',
@@ -169,17 +170,8 @@
             tel:'17739460368',
             Date:'2023-11-12',
             Fund:'200000',
-            input:"肯德基",
           },
-
-          options: [{
-            value: '选项1',
-            label: '中德学院'
-          }],
-          value: '中德学院',
-          textarea:'周四福利大放送',
-          input:'',
-        
+          textarea:'周四福利大放送',   //项目简介
           tableData:[{
             Name:'徐晓慧',
             class:'22电子通信G5',
@@ -187,40 +179,39 @@
             score:'-',
           },
           ],
-          pavalues:{
-            value:'',
-            value1:'',
-            value2:'',
-            value3:'',
-            value4:'',
-
-          }
         }
       },
       methods:{
-        lookDetail(){   //查看详情
-
-        },
-        content(){
-          this.$router.push('/projectApplicationDetails')
+        lookDetail(){   //项目成员列表查看详情
+            console.log('看不到');
         },
-        remark(){
+        remark(){    //导航栏项目详情按钮
           this.$router.push('/projectApplication2')
         },
-        backBtn2(){
-          // this.$router.push('/projectApplication')
+        audit(){    //立即审核按钮
           this.$message.success('审核成功')
         },
-        handleSelectionChange(val) {
-          this.multipleSelection = val;
-        },
-        back(){
+        back(){     //返回按钮
           this.$router.push('/projectApplication')
+        },
+        getData(){   //初始化完成获取基本数据进行填充
+          let param={
+            uid:this.$store.state.userInfo.userid,
+          }
+            this.ajax
+                  .get(this.$store.state.api+'',param)
+                  .then(res=>{
+                      console.log(res);
+                  },err=>{
+                    console.log(err);
+                  })
         }
       },
-      created(){
-        this.value=(this.options[0].value)
-      }
+      created(){    //数据加载完成后触发
+        console.log('111');
+        this.getData();
+        // this.value=(this.options[0].value)
+      },
     }
 </script>