删除uuid

src/views/activityManage/makerActvity.vue

@@ -135,17 +135,12 @@
               <div class="operations">
                   <!-- <el-button type="primary" > -->
                         <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
-<<<<<<< HEAD
-                        <el-button type="primary" v-show="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
-                        <el-button type="info" disabled v-show="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
-=======
 
                         <el-button type="primary" v-if="scope.row.state==0"  @click="audi(scope.row)" size="mini">审核</el-button>
                         <el-button type="info" disabled style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.state==1"  @click="audi(scope.row)" size="mini">审核</el-button>
                         
->>>>>>> 1a40f4474359a33ad35933277aac9e657fbc7bd2
                         <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
-                        <el-button type="primary" v-if="scope.row.reportFile==''||scope.row.reportFile==null" size="mini" @click="end(scope.row)" >完结</el-button>
+                        <el-button type="primary" v-show="scope.row.reportFile==''||scope.row.reportFile==null" size="mini" @click="end(scope.row)" >完结</el-button>
                         <el-button type="info" v-show="scope.row.reportFile!=''&&scope.row.reportFile!=null" size="mini" disabled>完结</el-button>
                   <!-- </el-button> -->
               </div>
@@ -406,7 +401,7 @@ import beUpload from '../../components/tool/beUpload'
           this.endDialog=true;
         },
         ending(){   //完结提交
-          if(this.endTable.file.length.length==0)return this.$message.error("请上传完结报告");
+          if(this.endTable.file.length<=0)return this.$message.error("请上传完结报告");
           this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
             uid:this.$store.state.userInfo.userid,
             aid:this.endTable.Id,
@@ -466,7 +461,6 @@ import beUpload from '../../components/tool/beUpload'
             this.options1 = data[2];
             this.options2 = data[3];
             this.Page.total = data[4][0]['total'];
-            console.log(this.tableData)
           }).catch(err=>{
             this.$message.error(err.message)
           })

src/views/activityManage/makerActvityApply.vue

@@ -143,8 +143,8 @@
                   >
                   <template #default="scope">
                       <div class="operations">
-                              <el-button type="primary" size="mini" @click="updateTeacher(scope.row.Id)">修改</el-button>
-                              <el-button type="primary" size="mini" @click="deleteRow(scope.row.Id)">删除</el-button>
+                              <el-button type="primary" size="mini" @click="updateTeacher(scope.$index)">修改</el-button>
+                              <el-button type="primary" size="mini" @click="deleteRow(scope.$index)">删除</el-button>
                       </div>
                   </template>
                 </el-table-column>
@@ -181,7 +181,7 @@
   
         <!--添加成员dialog对话框开始 -->
          <el-dialog
-            :title="Member.Id==''?'添加指导老师':'修改指导老师'"
+            :title="isAddTeacher?'添加指导老师':'修改指导老师'"
             :visible.sync="addMemberDialog"
             class="AddMember"
             :before-close="handleClose">
@@ -207,8 +207,8 @@
                 </div>
               </div>
               <div slot="footer" class="footer">
-                <el-button v-if="Member.Id==''" type="primary" @click="commit" class="diaBtn" size="small">确认提交</el-button>
-                <el-button v-if="!Member.Id==''"  type="primary" @click="change" class="diaBtn" size="small">确认修改</el-button>
+                <el-button v-if="isAddTeacher" type="primary" @click="commit" class="diaBtn" size="small">确认提交</el-button>
+                <el-button v-if="!isAddTeacher"  type="primary" @click="change" class="diaBtn" size="small">确认修改</el-button>
                 <el-button @click="handleClose" class="diaBtn" size="small">取消</el-button>
               </div>
         </el-dialog>
@@ -220,18 +220,17 @@
   </template>
   
   <script>
-  import { uuid } from 'vue-uuid';
       export default {
         props:["next","data","checkPhone"],
         data() {
           return {
             addMemberDialog:false,
             Member:{
-              Id:"",
               Name:'',
               work:'',
               takeCharge:''
             },
+            isAddTeacher:true,
           }
         },
         methods:{
@@ -247,8 +246,7 @@
           },
           commit(){
             //判断是否全部填写
-            for(let a in this.Member)if(a!='Id'&&/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-            this.Member.Id = uuid.v1();
+            for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
             let pushData={};
             Object.assign(pushData,this.Member)
             this.data.select.teacher.push(pushData);
@@ -258,26 +256,29 @@
               message:"添加成功",
               type:"success"
             });
+            this.isAddTeacher = true;
           },
           change(){
-            if(this.Member.Id=='')return this.$message.error("错误");
+            if(this.isAddTeacher)return this.$message.error("错误");
             for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-            Object.assign(this.data.select.teacher.filter(item=>item.Id==this.Member.Id)[0],this.Member)
+            Object.assign(this.data.select.teacher[this.Member.index],this.Member)
             for(let i in this.Member)this.Member[i]='';
-            this.addMemberDialog = true;
-            this.$message({message:"修改成功",type:"success"})
             this.addMemberDialog = false;
+            this.isAddTeacher = true;
           },
           handleClose(){
             for(let i in this.Member)this.Member[i] = '';
             this.addMemberDialog=false;
+            this.isAddTeacher = true;
           },
-          updateTeacher(Id){
-            Object.assign(this.Member,this.data.select.teacher.filter(item=>item.Id==Id)[0])
+          updateTeacher(index){
+            Object.assign(this.Member,this.data.select.teacher[index]);
+            this.Member['index'] = index;
+            this.isAddTeacher = false;
             this.addMemberDialog = true;
           },
-          deleteRow(Id){
-            this.data.select.teacher = this.data.select.teacher.filter(item=>item.Id!=Id);
+          deleteRow(index){
+            this.data.select.teacher.splice(index,1);
             this.$message({message:"删除成功",type:"success"})
           },
           toPage(val){
@@ -292,9 +293,6 @@
             }
           }
         },
-        // created(){
-          // this.value=(this.options[0].value)
-        // }
       }
   </script>
   

src/views/activityManage/makerActvityDetails.vue

@@ -86,11 +86,11 @@
             </div>
             <div style="width: 85%" v-loading="downloadNow" element-loading-text="文件正在下载中">
               <div style="display: flex;width: 100%;flex-direction: column;" >
-                  <div class="download" v-for="item in tableData.reportFile" :key="item.fid">
+                  <div class="download" v-for="item in tableData.reportFile" :key="item.url">
                       <span>{{ item.fileName }}</span>
                       <div class="downloadBtn">
                         <el-button type="primary" size="mini" @click="download(item)">下载文件</el-button>
-                        <el-button type="primary" @click="checkDelFile(item.fid)" size="mini">删除文件</el-button>
+                        <el-button type="primary" @click="checkDelFile(item.url)" size="mini">删除文件</el-button>
                       </div>
                   </div>
                   <!-- <div  class="download" v-if="tableData.reportFile!=''&&tableData.reportFile!=null">{{ tableData.reportFile!=''&&tableData.reportFile!=null?JSON.parse(tableData.reportFile).fileName:'' }}</div> -->
@@ -151,8 +151,8 @@
                   <template #default="scope">
                       <div class="operations">
                           <!-- <el-button type="primary" > -->
-                              <el-button type="primary" size="mini" @click="updateTeacher(scope.row.Id,scope.$index)" style="font-size: 14px;">修改</el-button>
-                              <el-button type="primary" size="mini" style="font-size: 14px;" @click="DeleteS(scope.row)">删除</el-button>
+                              <el-button type="primary" size="mini" @click="updateTeacher(scope.$index)" style="font-size: 14px;">修改</el-button>
+                              <el-button type="primary" size="mini" style="font-size: 14px;" @click="DeleteS(scope.$index)">删除</el-button>
                           <!-- </el-button> -->
                       </div>
                   </template>
@@ -206,7 +206,7 @@
 
             <!--添加成员dialog对话框开始 -->
               <el-dialog
-                  :title="Member.Id==''?'添加指导老师':'修改指导老师信息'"
+                  :title="isAddTeacher?'添加指导老师':'修改指导老师信息'"
                   :visible.sync="addMemberDialog"
                   class="AddMember"
                   :before-close="handleClose">
@@ -232,8 +232,8 @@
                       </div>
                     </div>
                     <div slot="footer" class="footer">
-                      <el-button v-if="Member.Id==''" type="primary" @click="commit" class="diaBtn"  size="small">确认提交</el-button>
-                      <el-button v-if="Member.Id!=''" type="primary" @click="change" class="diaBtn"  size="small">确认修改</el-button>
+                      <el-button v-if="isAddTeacher" type="primary" @click="commit" class="diaBtn"  size="small">确认提交</el-button>
+                      <el-button v-if="!isAddTeacher" type="primary" @click="change" class="diaBtn"  size="small">确认修改</el-button>
                       <el-button @click="handleClose" class="diaBtn" size="small">取消</el-button>
                     </div>
               </el-dialog>
@@ -298,7 +298,6 @@
 
 <script>
 import { VueEditor } from "vue2-editor";
-import { uuid } from 'vue-uuid';
 import BeUpload from '../../components/tool/beUpload.vue'
 import downloadFile from '@/components/tool/downloadFile.js'
 export default {
@@ -351,11 +350,11 @@ export default {
         name:"",
       },
       Member:{
-        Id:'',
         Name:'',
         work:'',
         takeCharge:''
       },
+      isAddTeacher:true,
       }
   },
   methods:{
@@ -363,7 +362,7 @@ export default {
       downloadFile(item['url'],item['fileName'],(_b)=>this.downloadNow = _b);
     },
     DelFileYes(){
-      let newFile = this.tableData.reportFile.filter(item=>item.fid!=this.DelFileData.fid);
+      let newFile = this.tableData.reportFile.filter(item=>item.url!=this.DelFileData.url);
       this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
         uid:this.$store.state.userInfo.userid,
         aid:this.$route.query['Id'],
@@ -380,12 +379,11 @@ export default {
         this.$message.error(err.message)
       })
     },
-    checkDelFile(Id){
-      this.DelFileData = this.tableData.reportFile.filter(item=>item.fid==Id)[0];
+    checkDelFile(url){
+      this.DelFileData = this.tableData.reportFile.filter(item=>item.url==url)[0];
       this.DelFileDialog = true;
     },
     getFile(val) {//上传文件
-      val.fid = uuid.v1()
       let newData = [...this.tableData.reportFile,val];
       this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
         uid:this.$store.state.userInfo.userid,
@@ -406,12 +404,13 @@ export default {
       if(this.check()!=1)return;
       this.dialogVisible1 = true;
     },
-    DeleteS(row){
-      this.delTeacherTable = row;
+    DeleteS(index){
+      this.delTeacherTable = this.tableData.course_teacher[index];
+      this.delTeacherTable.index = index;
       this.DelTeacherDialog = true;
     },
     DelTeacherYes(){
-      this.tableData.course_teacher = this.tableData.course_teacher.filter(item=>item.Id!=this.delTeacherTable.Id);
+      this.tableData.course_teacher.splice(this.delTeacherTable.index);
       this.DelTeacherDialog = false;
 
     },
@@ -447,15 +446,16 @@ export default {
       })
     },
     change(){
-      if(this.Member.Id=='')return this.$message.error("错误");
+      if(this.isAddTeacher)return this.$message.error("错误");
       for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-      Object.assign(this.tableData.course_teacher.filter(item=>item.Id==this.Member.Id)[0],this.Member)
+      Object.assign(this.tableData.course_teacher[this.Member.index],this.Member)
       for(let i in this.Member)this.Member[i]='';
-      this.addMemberDialog = true;
       this.addMemberDialog = false;
     },
-    updateTeacher(Id){
-      Object.assign(this.Member,this.tableData.course_teacher.filter(item=>item.Id==Id)[0])
+    updateTeacher(index){
+      Object.assign(this.Member,this.tableData.course_teacher[index])
+      this.Member.index = index;
+      this.isAddTeacher = false;
       this.addMemberDialog = true;
     },
     //检查整个表单
@@ -527,9 +527,9 @@ export default {
     },
     commit(){
       //判断是否全部填写
-      for(let a in this.Member)if(a!='Id'&&/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
-      this.Member.Id = uuid.v1();
+      for(let a in this.Member)if(/^\s*$/g.test(this.Member[a]))return this.$message.error("请不要留空")
       let pushData={};
+      delete this.Member.index
       Object.assign(pushData,this.Member)
       this.tableData.course_teacher.push(pushData);
       for(let i in this.Member)this.Member[i] = '';
@@ -542,6 +542,7 @@ export default {
       this.$router.push('/makerActvity')
     },
     addTeacher(){
+      this.isAddTeacher = true;
       this.addMemberDialog=true;
     },
     getAllClass(){

src/views/credit/credit.vue

@@ -230,8 +230,6 @@
             this.options2 = res.data[3]
             this.options3 = res.data[4]
             this.Page.total = res.data[5][0]['total']
-            console.log(res.data)
-            console.log(this.Page.total);
             this.tableData = data;
           }).catch(err=>{
             console.log(err)

src/views/credit/credit1.vue

@@ -56,7 +56,7 @@
       <!-- 成员学分登记开始 -->
         <div class="tabTit">
           <div><p>成员学分登记</p></div>
-          <el-button type="primary" size="mini">项目详情</el-button>
+          <el-button @click="selectProject" type="primary" size="mini">项目详情</el-button>
         </div>
         <hr>
         <el-table
@@ -180,6 +180,10 @@
           }
         },
         methods:{
+          selectProject(){
+            localStorage.setItem('pid',JSON.stringify(this.$route.query["Id"]))
+            this.$router.push(`/ProjectManagement1`)
+          },
           setCredit(row){
             this.changeScoreTable = row;
             this.changeScoreDialog = true;
@@ -197,7 +201,7 @@
             })
           },
           changeScore(){
-            if(this.changeScoreTable.score<0||this.changeScoreTable.score>100)return this.$message.warning("学分只能再0~100之间")
+            if(this.changeScoreTable.score<0||this.changeScoreTable.score>100)return this.$message.warning("学分只在0~100之间")
             let newData = [...this.tableData.course_student];
             newData.forEach(item=>item = item.id==this.changeScoreTable.id?this.changeScoreTable:item);
             this.ajax.post(this.$store.state.api+"/UpdateStudentScore",{