Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/projectManage/ProjectManagement3_1.vue

@@ -169,7 +169,7 @@
     <!-- 多行文本框区域结束 -->
     <div class="baseBtn">
             <div class="blockWidth">
-              <el-button type="primary" class="backBtn"  @click="updateActivityDialog" >提交</el-button>
+              <el-button type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
             </div>
           </div>
 
@@ -222,6 +222,23 @@
           </span>
         </el-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="handleClose" class="btn5" >取消</el-button>
+              </span>
+            </el-dialog>
+      <!-- 删除成员对话框结束 -->
+
+
+
+
     </div>
 </template>
 
@@ -240,6 +257,8 @@
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
               [{header:[false,1,2,3,4]}]
             ],
+            iid:'',        //为删除框储存id
+          delMember:false,   //删除对话框
           addMemberDialog:false,
           tableData:[],  //活动指导老师列表
           selects:{      //基础信息
@@ -275,7 +294,7 @@
                 }).then(res=>{
                   if(!res.data[0][0])return this.$message.error("错误")
                   let data = res.data[0][0];
-                  console.log(data);
+                  // console.log(data);
                   this.selects.projectName=data.title;
                   this.selects.fund=data.money;
                   this.selects.leader=data.pro_leader;
@@ -303,6 +322,7 @@
                 handleClose(){
                     this.addMemberDialog=false
                     this.updateActivity=false
+                    this.delMember=false
                     for(let i in this.Member)this.Member[i]='';
                 },
                 addTeacher(){    //添加老师对话框
@@ -337,17 +357,21 @@
                 this.$message({message:"修改成功",type:"success"})
                 this.addMemberDialog = false;
               },
-              deleteRow(Id){   //删除老师
-                this.tableData = this.tableData.filter(item=>item.Id!=Id);
+
+              deleteRow(Id){   //删除对话框出现
+                this.delMember=true
+                this.iid=Id
+              },
+              commitDelMember(){    //确定删除老师
+                this.tableData = this.tableData.filter(item=>item.Id!=this.iid);
                 this.$message({message:"删除成功",type:"success"})
+                this.delMember=false
               },
               updateActivityDialog(){   //显示修改提交对话框
                 this.updateActivity=true
               },
               submitAll(){      //确定提交修改
                   //保存修改
-                    const data = this.tableData;
-
                     const param = {
                       uid:this.$store.state.userInfo.userid,
                       aid:this.$route.query["Id"],
@@ -363,12 +387,11 @@
                       ph:this.selects.tel,
                       beginTime:JSON.stringify(this.selects.beginDate)
                     }
-                    // console.log(param)
-                    // return;
+
                     this.ajax.post(this.$store.state.api+"/UpdateActivity",param).then(res=>{
                       if(res.data==1){
                         this.$message.success("修改成功");
-                        this.dialogVisible1=false
+                        this.updateActivity=false
                         this.getData();
                       }else{
                         this.$message.error("修改失败"+res.data);
@@ -413,8 +436,8 @@
   </script>
 
   <style lang="less">
-   //提交对话框开始
-   .projectApplicationfundAddDialog{  
+   
+    .projectApplicationfundAddDialog{  //提交对话框开始
  
       .el-dialog__header{
         border-radius: 10px 10px 0 0;
@@ -488,7 +511,54 @@
       }
       }
       }
-//提交对话框结束
+
+    .delMemberDialog{    //删除对话框
+            font-size: 18px;
+            .el-dialog{
+              border-radius: 5px;
+              overflow: hidden;
+            }
+            .deleteContent{
+              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;
+            }
+            // .addDialogMid{
+            //   box-sizing: border-box;
+            //   padding:0 60px 0 10px;
+            //   .addDialogTit{
+            //     display: flex;
+            //     span{
+            //       width: 80px;
+            //       font-size: 16px;
+            //       line-height: 40px;
+            //       text-align: left;
+                  
+            //     }
+            //   }
+ 
+            // }
+            .dialog-footer{
+              display: flex;
+              justify-content: center;
+              box-sizing: border-box;
+              .btn5{
+                font-size: 16px;
+              }
+            }
+          }
   </style>
 
   

src/views/projectManage/ProjectManagement4.vue

@@ -152,12 +152,12 @@
                       // console.log(res.data);
                       let k=[]
                       res.data[0].forEach((e,i) => {
-                        console.log(e);
+                        // console.log(e);
                         let { projectFile: l } = e;
-                        console.log(l);
+                        // console.log(l);
                         k=JSON.parse(l)
                       });
-                      console.log(k);
+                      // console.log(k);
                       this.tableData=k
                     },err=>{
                       console.log(err);

src/views/projectManage/ProjectManagementFund1.vue

@@ -22,11 +22,11 @@
             </div>
             <div class="totalFund1">
                 <div class="totalFundLabel" style="display: flex;justify-content: flex-end;">已经支出</div>
-                <el-input v-model="input" placeholder="请输入内容"></el-input><span>(万)</span>
+                <el-input v-model="useFund" placeholder="请输入内容"></el-input><span>(万)</span>
             </div>
             <div class="totalFund1">
                 <div class="totalFundLabel" style="display: flex;justify-content: flex-end;">剩余</div>
-                <el-input v-model="input" placeholder="请输入内容"></el-input><span>(万)</span>
+                <el-input v-model="remainFund" placeholder="请输入内容"></el-input><span>(万)</span>
             </div>
           </div>
           <!-- 三个输入框结束 -->
@@ -199,7 +199,8 @@
           dialogVisible1:false,
           fundDetail:false,
           allFund:'',  //总经费
-
+          useFund:0,   //已使用
+          remainFund:'',  //剩余多少钱
           tableData:[],  //经费月支出经费计划
           tableData2:[],  //经费明细
           textarea:'',
@@ -223,24 +224,31 @@
                       // this.data=GetData
                       this.tableData=[GetData[1][0]]
                       this.tableData2=GetData[1][1]
-                      // console.log();
+                      console.log(this.tableData2);
+                      this.tableData2.forEach((e)=>{
+                        this.useFund=this.useFund+e.fund
+                      })
                       this.allFund=res.data[0][0].money
+                      this.useFund=this.useFund / 10000
+                      this.remainFund=this.allFund - this.useFund
+                      // console.log((this.useFund / 10000));
+                      // console.log();
                     },err=>{
                       console.log(err);
                     })
           },
-        lookDetail(){
+        // lookDetail(){
 
-        },
+        // },
         content(){
           this.$router.push('/ProjectManagementFund1')
         },
         remark(){
           this.$router.push('/ProjectManagementFund2')
         },
-        addBtn(){
-          // this.fundDetail=true;
-        },
+        // addBtn(){
+        //   // this.fundDetail=true;
+        // },
         back(){
           this.$router.push('/ProjectManagement')
         }