活动管理

src/views/activityManage/makerActvityApply.vue

@@ -70,13 +70,7 @@
                       <div class="selectRight">
                         <div class="inpBlock">
                               <div class="label">活动时间</div>
-                              <!-- <el-date-picker
-                                v-model="data.select.time"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                style="width: 100%;"
-                                placeholder="选择日期">
-                              </el-date-picker> -->
+    
                               <el-date-picker
                                 v-model="data.select.time"
                                 type="daterange"
@@ -361,5 +355,10 @@
     justify-content: center;
   }
 }
+.littleBlock{
+  .dialogLabel{
+    width: 15% !important;
+  }
+}
 
   </style>

src/views/activityManage/makerActvityApplyMain.vue

@@ -161,6 +161,7 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 uid:this.$store.state.userInfo.userid,
                 projectid:pid
               }).then(res=>{
+                console.log(res.data)
                 let PMoney = res.data[0][0]['PMoney'];
                 let AMoney = res.data[1][0]["AMoney"];
                 if(PMoney<(AMoney+aMoney)){

src/views/activityManage/makerActvityDetails.vue

@@ -563,7 +563,8 @@ export default {
         this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
             uid:this.$store.state.userInfo.userid,
         }).then(res=>{
-          this.selectInput.project = res.data[0].filter(item=>item.endProject==0);
+          console.log(res)
+          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||item.endProject==0));
           this.loading = false
         }).catch(err=>{
             this.$message.error(err.message)
@@ -584,6 +585,7 @@ export default {
         this.tableData = data;
         this.oldMoney += Number(this.tableData.money)
         this.getProject();
+        console.log(this.tableData)
         this.loading = false;
       }).catch(err=>{
         this.$message.error(err.message)