#

src/components/markeractivityWord.vue

@@ -140,7 +140,7 @@
                 </td>
                 <div class="operate">
                   <el-button @click="addPerson" v-if="wordData['member'].length-1==index" type="primary" size="mini">添加</el-button>
-                  <el-button @click="DelPerson(index)" type="primary" size="mini">删除</el-button>
+                  <el-button @click="DelPerson(index)"  type="primary" size="mini">删除</el-button>
                 </div>
             </tr>
             <tr class="textLeft">
@@ -445,8 +445,6 @@
                 {name:"",collage:"",work:""},
                 {name:"",collage:"",work:""},
                 {name:"",collage:"",work:""},
-                {name:"",collage:"",work:""},
-                {name:"",collage:"",work:""},
               ],
               activityPlan:"",//活动计划
               expectations:"",//预期目标

src/views/activityManage/components/NomMarkerWord.vue

@@ -106,7 +106,7 @@
                 </td>
                 <div class="operate">
                   <el-button @click="addPerson" v-if="wordData['member'].length-1==index" type="primary" size="mini">添加</el-button>
-                  <el-button @click="DelPerson(index)" type="primary" size="mini">删除</el-button>
+                  <el-button @click="DelPerson(index)" v-if="wordData['member'].length>1" type="primary" size="mini">删除</el-button>
                 </div>
             </tr>
             <tr class="textLeft" id="six">
@@ -327,10 +327,10 @@
               let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
               if(!result) return this.$message.error('请输入正确联系号码格式')
           },
-          addPerson(){   //添加学生
+          addPerson(){   //添加老师
             this.wordData['member'].push({name:"",collage:"",work:""});
           },
-          DelPerson(index){   //删除学生
+          DelPerson(index){   //删除老师
             this.wordData['member'].splice(index,1)
           },
           getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据

src/views/activityManage/components/markeractivityWord.vue

@@ -32,13 +32,7 @@
                 </td>
                 <td colspan="3">预算经费</td>
                 <td @click="goto('#fund')" colspan="4" v-text="total">
-                    <!-- <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入预算经费"
-                        v-model="total">
-                    </el-input> -->
+                    
                 </td>
             </tr>
             <tr id="three">
@@ -133,7 +127,7 @@
                 </td>
                 <div class="operate">
                   <el-button @click="addPerson" v-if="wordData['member'].length-1==index" type="primary" size="mini">添加</el-button>
-                  <el-button @click="DelPerson(index)" type="primary" size="mini">删除</el-button>
+                  <el-button @click="DelPerson(index)" v-if="wordData['member'].length>1" type="primary" size="mini">删除</el-button>
                 </div>
             </tr>
             <tr class="textLeft" id="six">

src/views/activityManage/newMarkerActivity.vue

@@ -50,8 +50,6 @@
             {name:"",collage:"",work:""},
             {name:"",collage:"",work:""},
             {name:"",collage:"",work:""},
-            {name:"",collage:"",work:""},
-            {name:"",collage:"",work:""},
           ],
           activityPlan:"",//活动计划
           expectations:"",//预期目标

src/views/activityManage/newNomMarkerActivity.vue

@@ -50,8 +50,7 @@ export default {
           {name:"",collage:"",work:""},
           {name:"",collage:"",work:""},
           {name:"",collage:"",work:""},
-          {name:"",collage:"",work:""},
-          {name:"",collage:"",work:""},
+
         ],
         activityPlan:"",//活动计划
         expectations:"",//预期目标

src/views/fundManage/newMarkerfundApply.vue

@@ -203,6 +203,11 @@ export default {
                 this.ty=res.data[0][0].type
 
 
+                this.fundList.forEach(e=>{
+                    e.havePaid=0
+                })
+
+
                 res['data'][1].filter(e=>{
                    if (e.actualuse==null) {
                         e.actualuse=e.applyfund