项目基本内容

src/views/projectApply/projectApplication.vue

@@ -302,7 +302,6 @@
           iid:'',
           textarea:'',
           input:'',
-          status:-1,
           dialogVisible:false,//立项审核
           dialogVisible1:false,//立项撤回提交
           dialogVisible2:false,//删除
@@ -417,18 +416,7 @@
           console.log(val);
           this.multipleSelection = val;
         },
-        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);
-          //     })
-        },
+       
         lookDetail(val){    //查看详情按钮
           console.log(val);
           localStorage.setItem("pid",JSON.stringify(val))
@@ -513,7 +501,6 @@
       },
       mounted(){      //跳转到此页面立刻获取数据
         this.getData();     //获取表格数据
-        // this.getOption();   //获取下拉框数据}
       }
 
     }

src/views/projectApply/projectApplicationApply.vue

@@ -212,7 +212,7 @@
 
       <!--修改成员dialog对话框开始 -->
       <el-dialog
-          title="修改成员333"
+          title="修改成员"
           :visible.sync="amendMemberDialog"
           :modal="true"
           :close-on-click-modal="true"
@@ -313,7 +313,7 @@
             this.amend(this.rowData)
             this.init()
         },
-        commitDelMember(){   //确定删除成员
+        commitDelMember(){   //对话框确定删除成员
           let a=this.rowData
           // let _this = this
           this.data.tableData.forEach((item, index, arr)=> {

src/views/projectApply/projectApplicationApply3.vue

@@ -26,7 +26,7 @@
           <hr>
           <div class="totalFund">
             <div class="totalFundLabel">预算总经费</div>
-            <el-input v-model="data2.fund" disabled style="width: 180px;" placeholder="请输入内容"></el-input>
+            <el-input v-model="data2.fund" style="width: 180px;" placeholder="请输入内容"></el-input>
             <div style="line-height: 38px;margin-left: 5px;">(万)</div>
           </div>
           <!-- 预算经费金额结束 -->

src/views/projectApply/projectApplicationApplyMain.vue

@@ -38,7 +38,7 @@
           <div class="addDialogLogo">LOGO</div>
           <div class="deleteContent">确定提交“×××”项目立项？</div>
           <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="init" class="btn5">确认提交</el-button>
+            <el-button type="primary" @click="submitAll" class="btn5">确认提交</el-button>
             <el-button @click="init" class="btn5" style="background:#cccccc" size="small">取消</el-button>
           </span>
         </el-dialog>
@@ -242,8 +242,11 @@
             },
             submitBtn(){   //预算经费页面提交按钮
                 console.log("提交啦");
-                this.submitData()
-                // this.submitHint = true;
+                this.submitHint = true;
+
+            },
+            submitAll(){
+              this.submitData()
             },
             submitData(){  //提交页面所有数据
               let a=this.projectApplicationApply1;

src/views/projectApply/projectApplicationDetails.vue

@@ -32,7 +32,7 @@
                     </div>
                     <div class="inpBlock">
                         <div class="label">所在部门</div>
-                        <el-select v-model="select.input" style="width: 100%;" placeholder="请选择">
+                        <el-select v-model="select.departmentData" style="width: 100%;" placeholder="请选择">
                           <el-option
                             v-for="item in select.department"
                             :key="item.id"
@@ -82,6 +82,7 @@
       <!-- 项目成员开始 -->
       <div class="tabTit">
           <div><p>项目成员</p></div>
+          <el-button type="primary" @click="addMember"  size="mini">添加成员</el-button>
       </div>
       <hr>
       <el-table
@@ -111,12 +112,12 @@
          >
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           prop="score"
           label="学分"
           align="center"
           >
-        </el-table-column>
+        </el-table-column> -->
         
         <el-table-column
           prop="operation"
@@ -125,7 +126,9 @@
           >
           <template #default="scope">
               <div class="operations">
-                      <el-button type="primary" @click="lookDetail(scope)" size="mini">查看详情</el-button>
+                      <!-- <el-button type="primary" @click="lookDetail(scope)" size="mini">查看详情</el-button> -->
+                      <el-button type="primary" @click="amendDialogData(scope.row)" size="mini">修改</el-button>
+                      <el-button type="primary" @click="Del(scope.row)" size="mini">删除</el-button>
               </div>
           </template>
         </el-table-column>
@@ -153,82 +156,124 @@
         <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button>
       </div>
     </div>
-     <!--添加成员查看详情dialog对话框开始 -->
-     <el-dialog
-          title="查看详情"
+      <!--添加成员dialog对话框开始 -->
+      <el-dialog
+          title="添加成员"
           :visible.sync="addMemberDialog"
           :modal="true"
           :close-on-click-modal="true"
-          class="projectApplicationDetailsAddMember"
+          class="AddMember"
           :before-close="init">
 
             <div class="littleBlock">
               <div class="dialogLabel">姓名</div>
               <div>
-                <el-input v-model="memberList.Name"></el-input>
+                <el-input v-model="addTabMember.name"></el-input>
               </div>
             </div>
 
             <div class="littleBlock">
               <div class="dialogLabel">班级</div>
               <div>
-                <el-input v-model="memberList.class"></el-input>
+                <el-input v-model="addTabMember.class"></el-input>
               </div>
             </div>
 
             <div class="littleBlock">
               <div class="dialogLabel">电话</div>
               <div>
-                <el-input v-model="memberList.tel"></el-input>
+                <el-input type="number" v-model="addTabMember.phone" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" ></el-input>
               </div>
             </div>
-            <div class="littleBlock">
+            <!-- <div class="littleBlock">
               <div class="dialogLabel">学分</div>
               <div>
-                <el-input v-model="memberList.score"></el-input>
+                <el-input type="number" v-model="addTabMember.score" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" ></el-input>
               </div>
-            </div>
+            </div> -->
             <div slot="footer" class="footer">
               <el-button type="primary" @click="commit" class="diaBtn" >确认提交</el-button>
-              <el-button @click="addMemberDialog=false" class="diaBtn">取消</el-button>
+              <el-button @click="init" class="diaBtn">取消</el-button>
             </div>
       </el-dialog>
-      <!--添加成员查看详情dialog对话框结束 -->
+      <!--添加成员dialog对话框结束 -->
 
-       <!-- 修改对话框开始 -->
-       <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          class="projectApplicationfundAddDialog"
-          style="top: 120px;"
+      <!--修改成员dialog对话框开始 -->
+      <el-dialog
+          title="修改成员"
+          :visible.sync="amendMemberDialog"
+          :modal="true"
+          :close-on-click-modal="true"
+          class="AddMember"
           :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
-          <div class="deleteContent">确定提交“×××”项目立项？</div>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="init" class="btn5">确认提交</el-button>
-            <el-button @click="init" class="btn5" style="background:#cccccc" size="small">取消</el-button>
-          </span>
+
+            <div class="littleBlock">
+              <div class="dialogLabel">姓名</div>
+              <div>
+                <el-input v-model="amendTabMember.name"></el-input>
+              </div>
+            </div>
+
+            <div class="littleBlock">
+              <div class="dialogLabel">班级</div>
+              <div>
+                <el-input v-model="amendTabMember.class"></el-input>
+              </div>
+            </div>
+
+            <div class="littleBlock">
+              <div class="dialogLabel">电话</div>
+              <div>
+                <el-input type="number" v-model="amendTabMember.phone" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" ></el-input>
+              </div>
+            </div>
+            <!-- <div class="littleBlock">
+              <div class="dialogLabel">学分</div>
+              <div>
+                <el-input type="number" v-model="amendTabMember.score" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" ></el-input>
+              </div>
+            </div> -->
+            <div slot="footer" class="footer">
+              <el-button type="primary" @click="commit2" class="diaBtn" >确认提交</el-button>
+              <el-button @click="init" class="diaBtn">取消</el-button>
+            </div>
+      </el-dialog>
+      <!--修改成员dialog对话框结束 -->
+
+       <!-- 删除成员对话框开始 -->
+       <el-dialog
+              title="删除成员"
+              :visible.sync="delMember"
+              width="600px"
+              class="delMemberDialog">
+              <span class="deleteContent">确定删除成员?</span>
+              <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="commitDelMember" class="btn5">确认删除</el-button>
+                <el-button @click="init" class="btn5" >取消</el-button>
+              </span>
         </el-dialog>
-      <!-- 修改对话框结束 -->
-      
+      <!-- 删除成员对话框结束 -->
   </div>
 </template>
 
 <script>
+  import { uuid } from 'vue-uuid';
     export default {
       data() {
         return {
-          submitHint:false,
+          iid:'',
+          input:'',
+          delMember:false,
+          amendMemberDialog:false,
           addMemberDialog:false,
           select:{    //数据详情框数据
-            project:'',   
-            person:'',
-            input:"",  //select框值
+            project:'疯狂星期四',   
+            person:'袁一鸣',
+            departmentData:"",  //select框值
             sort:'',
-            tel:'',
+            tel:'17739460368',
             Date:'',
-            Fund:'',
+            Fund:'200000',
             sortOptions: [], //分类下拉框
             department:[],
           
@@ -237,31 +282,102 @@
 
           tableData:[],   //成员列表数据
           
-          memberList:{
-            Name:'',
+          addTabMember:{       //添加项目成员
+            id:'',
+            name:'',
             class:'',
-            tel:'',
-            score:''
+            phone:'',
+            // score:''
+          },
+          amendTabMember:{       //修改项目成员
+            id:'',
+            name:'',
+            class:'',
+            phone:'',
+            // score:''
           }
         }
       },
       methods:{
-        lookDetail(val){   //项目成员列表查看详情
-            // console.log('看不到');
+        
+
+        addMember(){       //添加成员按钮，显示对话框
             this.addMemberDialog=true
         },
+        commit(){         //对话框确认添加成员按钮 
+          // console.log(this.addTabMember.name);
+            if (this.addTabMember.name == undefined || this.addTabMember.name=='') return this.$message.error('请输入姓名')
+            if (this.addTabMember.class == undefined || this.addTabMember.name=='') return this.$message.error('请输入班级')
+            if (this.addTabMember.phone == undefined || this.addTabMember.name=='') return this.$message.error('请输入电话') 
+            // if (this.addTabMember.score == undefined || this.addTabMember.name=='') return this.$message.error('请输入分数') 
+
+            this.addTabMember.id=uuid.v1();
+            this.tableData.push(this.addTabMember)
+            this.$message.success('添加人员成功')
+            this.addTabMember={}
+            this.addMemberDialog=false;
+        },
+        amendDialogData(val){   //列表修改按钮
+          this.iid=val;
+          console.log(val);
+          // this.amendTabMember=val
+          Object.assign(this.amendTabMember,val)
+          this.amendMemberDialog=true;
+        },
+        commit2(){       //对话框确定修改按钮
+          this.tableData.forEach((e,i)=>{
+            if (e.id==this.iid.id) {
+              Object.assign(e,this.amendTabMember)
+              this.amendMemberDialog=false;
+              this.$message.success('修改信息成功')
+            }
+          })
+        },
+        Del(val){
+          this.iid=val;             //列表删除按钮
+          this.delMember=true;
+        },
+        commitDelMember(){    //对话框确定删除按钮
+          this.tableData.forEach((e,i,arr)=>{
+            if (e.id==this.iid.id) {
+              arr.splice(i,1)
+              this.$message.success('删除成功')
+              this.delMember=false;
+            }
+          })
+        },
         init(){
           this.addMemberDialog=false;
+          this.amendMemberDialog=false;
+          this.delMember=false;
 
         },
-        commit(){
-            this.addMemberDialog=false;
-        },
+
         remark(){    //导航栏项目详情按钮
           this.$router.push('/projectApplication2')
         },
         audit(){    //立即审核按钮
-          this.$message.success('修改成功')
+          // this.$message.success('审核成功')
+          let param={
+            uid:this.$store.state.userInfo.userid,
+            pid:JSON.parse(localStorage.getItem('pid')),
+            tit:this.select.project,
+            leader:this.select.person,
+            beginTime:this.select.Date,
+            cid:'',
+            mon:this.select.Fund,
+            phone:this.select.tel,
+            tid:'',
+            student:JSON.stringify(this.tableData),
+            con:this.textarea
+          }
+            this.ajax
+                  .post(this.$store.state.api+'/UpdateProjectBase',param)
+                  .then(res=>{
+                    this.$message.success('修改成功')
+                  },err=>{
+                    console.log(err);
+                  })
         },
         back(){     //返回按钮
           this.$router.push('/projectApplication')
@@ -274,8 +390,9 @@
             this.ajax
                   .get(this.$store.state.api+'/GetProjectBase',param)
                   .then(res=>{
+                    console.log(res);
                     let data=res.data[0][0]
-                    console.log(data);
+                    // console.log(data);
                     this.select.project=data.title;
                     this.select.Fund=data.money;
                     this.select.person=data.pro_leader;
@@ -283,7 +400,11 @@
                     // this.select.department=da.
                     this.textarea=data.brief;
                     this.tableData=JSON.parse(data.course_student) 
-                    this.select.tel=data.phone
+                    this.select.tel=data.phone;
+                    this.select.department=data.typeid;
+                    this.select.sort=data.courseId
+                    this.select.departmentData = data['classid']
+                    this.select.sort = data['typeid']
                   },err=>{
                     console.log(err);
                   })
@@ -295,24 +416,24 @@
                 this.ajax
                       .get(this.$store.state.api+'/SelectAllDepartment',param)
                       .then(res=>{
+                        // console.log(res.data);
                         this.select.department=res.data[0]
                       },err=>{
                         console.log(err);
                       })
             },
-            getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
-              let param={
-                uid:this.$store.state.userInfo.userid
-              }
-                this.ajax
-                      .get(this.$store.state.api+'/SelectAllType',param)
-                      .then(res=>{
-                        this.select.sortOptions=res.data[0]
-
-                      },err=>{
-                        console.log(err);
-                      })
-            },
+        getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
+          let param={
+            uid:this.$store.state.userInfo.userid
+          }
+            this.ajax
+                  .get(this.$store.state.api+'/SelectAllType',param)
+                  .then(res=>{
+                    this.select.sortOptions=res.data[0]
+                  },err=>{
+                    console.log(err);
+                  })
+        },
       },
       created(){    //数据加载完成后触发
         this.getData();
@@ -327,79 +448,39 @@
 <style lang="less">
 .projectApplication1{
 
-   //提交对话框开始
-   .projectApplicationfundAddDialog{  
- 
- .el-dialog__header{
-   border-radius: 10px 10px 0 0;
- }
- .el-dialog{
-   border-radius:10px ;
- }
- 
- .deleteContent{
-   width: 100%;
-   text-align: center;
-   font-size: 22px;
-   color: #000;
- }
- .addDialogLogo{
-   width: 60px;
-   height: 30px;
-   line-height: 30px;
-   background: #f2f2f2;
-   position: absolute;
-   left: 10px;
-   top: 10px;
-   text-align: center;
- }
- .el-dialog__header{
- background: #32455b;
- }
- .el-dialog__title{
-   // text-align: center;
-   margin-left:250px;
-   font-size: 22px;
-   color:rgb(246, 247, 246);
- }
- .addDialogMid{
-   box-sizing: border-box;
-   padding:0 60px 0 10px;
-   .addDialogTit{
-     display: flex;
-     span{
-       width: 80px;
-       line-height: 40px;
-       text-align: left;
-     }
-   }
- .addDialogTit1{
-   display: flex;
-   justify-content: space-between;
-   margin-bottom: 15px;
- }
- .addDialogTit2{
-   margin-top: 10px;
-   font-size: 18px;
-   color: #000;
-   text-indent: 2em;
- }
- .addDialogCon{
-   margin-top: 20px;
- }
-}
-.dialog-footer{
- display: flex;
- justify-content: center;
- .btn5{
-   height: 40px;
-   font-size: 16px;
-   background: #0e72e6;
-   width: 200px;
- }
-}
-}
-//提交对话框结束
+        .delMemberDialog{
+            font-size: 18px;
+            .el-dialog{
+              border-radius: 5px;
+              overflow: hidden;
+            }
+            .deleteContent{
+              margin: 30px 0;
+              font-size: 22px;
+              color: #000;
+            }
+            .el-dialog__header{
+              background: #32455b;
+              display: flex;
+              justify-content: center;
+            }
+            .el-dialog__title{
+              color:#fff;
+              font-size: 22px;
+            }
+            .el-dialog__body{
+              display: flex;
+              justify-content: center;
+            }
+            .dialog-footer{
+              display: flex;
+              justify-content: center;
+              box-sizing: border-box;
+              .btn5{
+                font-size: 16px;
+              }
+            }
+          }
 
   .projectApplicationDetailsAddMember{     //查看详情对话框样式
     .el-input__inner{