#

src/components/markerFundWord.vue

@@ -13,7 +13,7 @@
                         autosize
                         resize="none"
                         placeholder="请输入项目名称"
-                        v-model="input">
+                        v-model="wordData['projectName']">
                     </el-input>
                 </td>
             </tr>
@@ -24,16 +24,24 @@
                         autosize
                         resize="none"
                         placeholder="请输入负责人"
-                        v-model="input">
+                        v-model="wordData['pro_leader']">
                     </el-input>
                 </td><td colspan="2">所在部门</td><td colspan="3">
-                    <el-input
+                  <el-select v-model="wordData['college']" style="width: 100%;" placeholder="请选择所在学院">
+                    <el-option
+                      v-for="item in DepartmentData"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                    <!-- <el-input
                         type="textarea"
                         autosize
                         resize="none"
                         placeholder="请输入所在部门"
                         v-model="input">
-                    </el-input>
+                    </el-input> -->
                 </td><td colspan="2">联系电话</td><td colspan="3">
                     <el-input
                         type="textarea"
@@ -66,19 +74,27 @@
                 </td>
             </tr>
             <tr>
-                <td colspan="4">项目组人数</td><td colspan="2"></td><td colspan="3">参与学生人数</td><td colspan="2"></td><td colspan="3">预算总经费</td><td colspan="3"></td>
+                <td colspan="4">项目组人数</td><td colspan="2" v-text="wordData['member'].length"></td>
+                <td colspan="3">参与学生人数</td><td colspan="2">
+                  <el-input
+                    type="number"
+                    placeholder="请输入学生人数"
+                    v-model="wordData['student']">
+                  </el-input>
+                </td>
+                <td colspan="3">预算总经费</td><td colspan="3"></td>
             </tr>
             <tr>
-                <td colspan="2" rowspan="6"><p>项</p> <p>目</p> <p>组</p> <p>成</p> <p>员</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="9">项目分工</td>
+                <td colspan="2" :rowspan="wordData['member'].length+1"><p>项</p> <p>目</p> <p>组</p> <p>成</p> <p>员</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="10">项目分工</td>
             </tr>
-            <tr v-for="(item,index) in wordData.member" :key="index+'b'">
+            <tr v-for="(item,index) in wordData.member" :key="index">
                 <td colspan="2" style="border-left: none;">
                     <el-input
                         type="textarea"
                         autosize
                         resize="none"
                         placeholder="请输入姓名"
-                        v-model="input">
+                        v-model="item['name']">
                     </el-input>
                 </td><td colspan="3">
                     <el-input
@@ -86,7 +102,7 @@
                         autosize
                         resize="none"
                         placeholder="请输入工作单位/部门"
-                        v-model="input">
+                        v-model="item['collage']">
                     </el-input>
                 </td><td colspan="10">
                     <el-input
@@ -94,9 +110,13 @@
                         autosize
                         resize="none"
                         placeholder="请输入项目分工"
-                        v-model="input">
+                        v-model="item['work']">
                     </el-input>
                 </td>
+                <div class="operate">
+                  <el-button v-if="wordData['member'].length-1==index" @click="addPerson" type="primary" size="mini">+</el-button>
+                  <el-button @click="DelPerson(index)" type="primary" size="mini">-</el-button>
+                </div>
             </tr>
             <tr class="textLeft">
                 <td colspan="2" rowspan="2"><p>项目</p><br> <p>内容</p></td><td style="text-align: left;" colspan="15">
@@ -106,7 +126,7 @@
                       :rows="6"
                       style="width: 100%;"
                       resize="none"
-                      v-model="input">
+                      v-model="wordData['brief']">
                     </el-input>
                 </td>
             </tr>
@@ -118,7 +138,7 @@
                       :rows="6"
                       style="width: 100%;"
                       resize="none"
-                      v-model="input">
+                      v-model="wordData['innovate']">
                     </el-input>
                 </td>
             </tr>
@@ -130,7 +150,7 @@
                       :rows="6"
                       style="width: 100%;"
                       resize="none"
-                      v-model="input">
+                      v-model="wordData['expected']">
                     </el-input>
                 </td>
             </tr>
@@ -142,7 +162,7 @@
                       :rows="6"
                       style="width: 100%;"
                       resize="none"
-                      v-model="input">
+                      v-model="wordData['culture']">
                     </el-input>
                   </td>
             </tr>
@@ -154,7 +174,7 @@
                       :rows="6"
                       style="width: 100%;"
                       resize="none"
-                      v-model="input">
+                      v-model="wordData['incubate']">
                     </el-input>
                   </td>
             </tr>
@@ -165,7 +185,7 @@
                       :rows="10"
                       style="width: 100%;"
                       resize="none"
-                      v-model="input">
+                      v-model="wordData['ImplementationPlan']">
                     </el-input>
                 </td>
             </tr>
@@ -291,56 +311,37 @@
     
             wordData:{
               applicationDate:getNowDate(1),//申请日期
-              projectName:'',
-              radio: '',
-              checkList:[],
-              schoolRadio:'',
-              applyParsonRadio:'',
-              applyParsonName:'',
-              college:'',
-              tel:'',
-              beginTime:'',
-              endTime:'',
+              projectName:'',//项目名称
+              pro_leader:"",//项目负责人
+              college: '',//所在学院
+              tel:'',//联系电话
+              beginTime:'',//项目起始时间
+              endTime:'',//计划完成时间
+              student:"",//学生人数
               member:[
-                {sort:'',project:'',fund:''},
-                {sort:'',project:'',fund:''},
-                {sort:'',project:'',fund:''},
-                {sort:'',project:'',fund:''},
-                {sort:'',project:'',fund:''},
-
-                
-              ],
-              fund:[
-                {name:'',collage:'',work:''},
-                {name:'',collage:'',work:''},
+                {name:"",collage:"",work:""},
+                {name:"",collage:"",work:""},
+                {name:"",collage:"",work:""},
+                {name:"",collage:"",work:""},
+                {name:"",collage:"",work:""},
               ],
-              brief:'',
-              introduce:{
-                back:'',
-                innovate:'',
-                path:'',
-                scene:'',
-                worth:'',
-                team:'',
-                cost:'',
-                expectResults:'',
-                expectResultsTeacher:'',
-                expectConversion:'',
-                plan:''
-              },
-              // fund:{
-              //   facility:'',
-              //   materials:'',
-              //   process:'',
-              //   assist:'',
-              //   authenticate:'',
-              //   match:'',
-              //   activity:'',
-              //   affair:''
-              // }
+              brief:"",//项目简介
+              innovate:"",//创新点
+              expected:"",//项目预期成果、数量及形式
+              culture:"",//创客人才培养预期成果、数量
+              incubate:"",//项目预期孵化、转化创业项目情况
+              ImplementationPlan:"",//项目实施计划
+              fund:{
+                device:"",
+                Material:"",
+                processing:"",
+                Collaboration:"",
+                APPRAISAL:"",
+                entery:"",
+                activities:"",
+                Transaction:"",
+              },//预算经费
             }
-              
-    
             //total：总经费     
             //小型仪器设备费：device        deviceRemarks
             //材料费：Material             MaterialRemarks
@@ -358,11 +359,11 @@
               let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
               if(!result) return this.$message.error('请输入正确联系号码格式')
             },
-          addStudent(){   //添加学生
-            this.wordData.studentS.push({name:"",collage:"",work:""});
+          addPerson(){//添加成员
+            this.wordData['member'].push({name:"",collage:"",work:""});
           },
-          DelStudent(index){   //删除学生
-            this.wordData.studentS.splice(index,1)
+          DelPerson(index){//删除成员
+            this.wordData['member'].splice(index,1)
           },
           getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
             this.ajax.get(this.$store.state.api+'/SelectAllDepartment',{
@@ -544,8 +545,9 @@
             // border-right:  solid 1px black;
             // border-left:  solid 1px black;
 
-
-            tr td{
+          tr{
+            position: relative;
+            td{
               border: none;
               border-bottom: solid 1px black;
               // border-left: solid 1px black;
@@ -554,6 +556,7 @@
               text-align: center;
               line-height: 30px;
               width: 80px;
+              
               &:nth-child(1){
                 border-left:  solid 1px black;
               }
@@ -578,6 +581,8 @@
               }
             }
           }
+          }
+            
           .twoCol{
             column-span: 2;
           }

src/views/Word.vue

@@ -3,8 +3,8 @@
     <div v-loading="loading" id="test">
       <div id="word">
         <!-- <studentProjectWord />  -->   <!-- 学生项目立项 -->
-        <!-- <markerFundWord/> -->         <!-- 创客专项资金及项目申请表（个人创客） -->
-        <markeractivityWord/>              <!-- 创客专项资金及项目申请表（创客活动） -->
+        <markerFundWord/>         <!-- 创客专项资金及项目申请表（个人创客） -->
+        <markeractivityWord/>              <!--创客专项资金及项目申请表（创客活动）-->
       </div>
       <!-- <div>
         <BeUpload