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

src/views/activityManage/makerActvity.vue

@@ -135,7 +135,7 @@
           <template #default="scope">
               <div class="operations">
                   <!-- <el-button type="primary" > -->
-                        <el-button type="primary"  @click="MADetails" size="mini">查看详情</el-button>
+                        <el-button type="primary"  @click="MADetails(scope.row.acId)" size="mini">查看详情</el-button>
                         <el-button type="primary"  @click="audi" size="mini">审核</el-button>
                         <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
                         <el-button type="primary"  size="mini" @click="end" >完结</el-button>
@@ -370,8 +370,8 @@
           this.$router.push('/makerActvityApplyMain')
         },
    
-        MADetails(){   // 查看详情
-          this.$router.push('/makerActvityDetails')
+        MADetails(Id){   // 查看详情
+          this.$router.push(`/makerActvityDetails?Id=${Id}`)
         },
         CurrentChange(nowPage){
           this.Page.nowPage = nowPage;
@@ -399,10 +399,10 @@
           })
         },
         GetTime(data){
-          data = JSON.parse(data);
-          if(data[0]==data[1])return data[0];
-          let sp1 = data[0].split('-')
-          let sp2  =data[1].split('-')
+          let cdata = JSON.parse(data);
+          if(cdata[0]==cdata[1])return cdata[0];
+          let sp1 = cdata[0].split('-')
+          let sp2  =cdata[1].split('-')
           if(sp1[0]==sp2[0]){
             if(sp1[1]==sp2[1]){
               return `${sp1[0]}-${sp1[1]}-${sp1[2]} 至 ${sp2[2]}`
@@ -410,7 +410,7 @@
               return `${sp1[0]}-${sp1[1]}-${sp1[2]} 至 ${sp2[1]}-${sp2[2]}`
             }           
           }else{
-            return data[0]+" 至 "+data[1]
+            return cdata[0]+" 至 "+cdata[1]
           }
         }
       },

src/views/activityManage/makerActvityDetails.vue

@@ -15,49 +15,65 @@
           <div class="select">
                     <div class="selectTop">
                       <div class="label">活动名称</div>
-                      <el-input v-model="data.projectName" placeholder="请输入内容"></el-input>
+                      <el-input v-model="tableData.ActiveName" placeholder="请输入内容"></el-input>
                     </div>
                     <div class="selectMid">
                       <div class="selectLeft">
                           <div class="inpBlock" style="position: relative;">
+                              <div class="label">所属项目</div>
+                              <el-select v-model="tableData.pid" style="width: 100%;" placeholder="请选择">
+                                <el-option
+                                  v-for="item in selectInput.project"
+                                  :key="item.courseId"
+                                  :label="item.title"
+                                  :value="item.courseId">
+                                </el-option>
+                              </el-select>
+                          </div>
+                          <div class="inpBlock">
                               <div class="label">预算经费</div>
-                              <el-input v-model="data.budget" placeholder="请输入内容"></el-input>
+                              <el-input type="number" v-model.number="tableData.money" placeholder="请输入预算经费"></el-input>
                               <div style="position: absolute;right: -28px;top:8px">(元)</div>
                           </div>
                           <div class="inpBlock">
                               <div class="label">负责人</div>
-                              <el-input v-model="data.person" placeholder="请输入内容"></el-input>
+                              <el-input v-model="tableData.leader"></el-input>
                           </div>
                           <div class="inpBlock">
                               <div class="label">所在部门</div>
-                              <el-select v-model="data.department" style="width: 100%;" placeholder="请选择">
+                               <el-select v-model="tableData.classid" style="width: 100%;" placeholder="请选择">
                                 <el-option
-                                  v-for="item in data.departmentOptions"
-                                  :key="item.value"
-                                  :label="item.label"
-                                  :value="item.value">
+                                  v-for="item in selectInput.class"
+                                  :key="item.id"
+                                  :label="item.name"
+                                  :value="item.id">
                                 </el-option>
                               </el-select>
                           </div>
-                          <div class="inpBlock">
-                              <div class="label">联系电话</div>
-                              <el-input v-model="data.tel" placeholder="请输入内容"></el-input>
-                          </div>
                       </div>
 
                       <div class="selectRight">
                         <div class="inpBlock" style="position: relative;">
-                              <div class="label">实际使用经费</div>
-                              <el-input v-model="data.fund" placeholder="请输入内容"></el-input>
-                              <div style="position: absolute;right: -28px;top:8px">(元)</div>
+                              <div class="label">活动时间</div>
+                              <el-date-picker
+                                v-model="tableData.begin_at"
+                                type="daterange"
+                                value-format="yyyy-MM-dd"
+                                style="width: 100%;"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期">
+                              </el-date-picker>
+                              <!-- <el-input v-model="data.fund" placeholder="请输入内容"></el-input>
+                              <div style="position: absolute;right: -28px;top:8px">(元)</div> -->
                           </div>
                           <div class="inpBlock">
                               <div class="label">参与学生人数</div>
-                              <el-input v-model="data.num" placeholder="请输入内容"></el-input>
+                              <el-input type="number" v-model.number="tableData.student" placeholder="请输入内容"></el-input>
                           </div>
                           <div class="inpBlock">
-                              <div class="label">活动时间</div>
-                              <el-input v-model="data.date" placeholder="请输入内容"></el-input>
+                              <div class="label">联系电话</div>
+                              <el-input v-model="tableData.phone" placeholder="请输入内容"></el-input>
                           </div>
                       </div>
                     </div>
@@ -87,7 +103,7 @@
               </div>
               <hr>
               <el-table
-                :data="tableData"
+                :data="tableData.teacher"
                 tooltip-effect="dark"
                 stripe
                 class="fontSize"
@@ -101,7 +117,7 @@
                   >
                 </el-table-column>
                 <el-table-column
-                  prop="class"
+                  prop="work"
                   label="工作单位"
                   align="center"
                   >
@@ -122,8 +138,8 @@
                   <template #default="scope">
                       <div class="operations">
                           <!-- <el-button type="primary" > -->
-                              <el-button type="primary" size="mini" style="background: #477edd;font-size: 14px;">修改</el-button>
-                              <el-button type="primary" size="mini" style="background: #477edd;font-size: 14px;" @click="DeleteS(scope.rows.id)">删除</el-button>
+                              <el-button type="primary" size="mini" style="font-size: 14px;">修改</el-button>
+                              <el-button type="danger" size="mini" style="font-size: 14px;" @click="DeleteS(scope.rows.id)">删除</el-button>
                           <!-- </el-button> -->
                       </div>
                   </template>
@@ -139,7 +155,7 @@
                 type="textarea"
                 :rows="6"
                 placeholder="请输入内容"
-                v-model="activity.introduce">
+                v-model="tableData.brief">
               </el-input>
             <div class="tabTit">
                  <div><p>活动计划</p></div>
@@ -148,7 +164,7 @@
                 type="textarea"
                 :rows="6"
                 placeholder="请输入内容"
-                v-model="activity.plan">
+                v-model="tableData.chapters[0]">
               </el-input>
             <div class="tabTit">
                  <div><p>预期目标</p></div>
@@ -157,7 +173,7 @@
                 type="textarea"
                 :rows="6"
                 placeholder="请输入内容"
-                v-model="activity.target">
+                v-model="tableData.chapters[1]">
               </el-input>
             <div class="tabTit">
                  <div><p>活动受面</p></div>
@@ -166,7 +182,7 @@
                 type="textarea"
                 :rows="6"
                 placeholder="请输入内容"
-                v-model="activity.scope">
+                v-model="tableData.chapters[2]">
               </el-input>
             <div class="tabTit">
                  <div><p>经费支出计划</p></div>
@@ -176,7 +192,7 @@
                 :rows="6"
                 class="textArea"
                 placeholder="请输入内容"
-                v-model="activity.expend">
+                v-model="tableData.chapters[3]">
               </el-input>
             <!-- 多行文本框部分结束 -->
 
@@ -207,7 +223,7 @@
                     <div class="littleBlock">
                       <div class="dialogLabel">工作单位</div>
                       <div>
-                        <el-input v-model="Member.class"></el-input>
+                        <el-input v-model="Member.work"></el-input>
                       </div>
                     </div>
 
@@ -231,43 +247,34 @@ export default {
   data() {
     return {
       addMemberDialog:false,
-            data:{
-                projectName:'疯狂星期四',
-                budget:'200',
-                fund:"200000",
-                department:'肯德基',
-                person:'袁一鸣',
-                num:'10',
-                departmentOptions: [{
-                  value: '1',
-                  label: '肯德基'
-                },
-                {
-                  value: '2',
-                  label: '肯德基'
-                }],
-                date:'2023-11-12',
-                tel:'17739460368'
-            },
-            activity:{
-              introduce:'每周四福利大放送',
-              plan:'没有计划，主打真诚',
-              target:'为家人谋福利',
-              scope:'深技师',
-              expend:'1000万'
-            },
-            Member:{
-              Name:'袁一鸣',
-              class:'信通学院',
-              takeCharge:'ui'
-            },
-            tableData:[{
-              Name:'袁一鸣',
-              class:'22电子通信G5',
-              takeCharge:'ui设计',
-            },
-            ],
-          
+      tableData:{
+        ActiveName:"活动名称",
+        pid:"1",
+        money:9999999,
+        leader:"覃罡彤",
+        classid:"1",
+        begin_at:[],
+        student:0,
+        phone:"19128326542",
+        teacher:[{Id:"aofiowhff",Name:"覃罡彤",takeCharge:"睡觉",work:"工作单位"}],
+        brief:"awfawfawfga",
+        chapters:["1111","22222","333333","4444444"],
+      },
+      selectInput:{
+        project:[{
+          courseId:"1",
+          title:"所属项目"
+        }],
+        class:[{
+          id:"1",
+          name:"信息与通信学院"
+        }]
+      },
+      Member:{
+        Name:'袁一鸣',
+        work:'信通学院',
+        takeCharge:'ui'
+      },
       }
   },
   methods:{
@@ -279,7 +286,7 @@ export default {
     },
     commit(){
       this.addMemberDialog=false;
-      this.tableData.push(this.Member)
+      // this.tableData.push(this.Member)
     },
     handleClose(){
       this.addMemberDialog=false;
@@ -289,8 +296,31 @@ export default {
     },
     addTeacher(){
       this.addMemberDialog=true;
-
+    },
+    getAllClass(){
+        this.ajax.get(this.$store.state.api+"/SelectAllDepartment",{
+            uid:this.$store.state.userInfo.userid,
+        }).then(res=>{
+            this.makerActvityApplyData.class = res.data[0];
+        }).catch(err=>{
+            this.$message.error(err.message)
+        })
+    },
+    getProject(){
+        this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
+            uid:this.$store.state.userInfo.userid,
+        }).then(res=>{
+            this.makerActvityApplyData.project = res.data[0];
+        }).catch(err=>{
+            this.$message.error(err.message)
+        })
+    },
+    getData(){
+      console.log(this.$route.query["Id"]);
     }
+  },
+  mounted(){
+    this.getData();
   }
 }
 </script>