#

src/views/projectApplicationApply.vue

@@ -89,7 +89,7 @@
               </div>
               <hr>
               <el-table
-                :data="tableData"
+                :data="data.tableData"
                 tooltip-effect="dark"
                 stripe
                 :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
@@ -126,8 +126,8 @@
                   <!-- <template #default="scope"> -->
                       <div class="operations">
                           <!-- <el-button type="primary" > -->
-                              <el-button type="primary" class="bt1" size="mini" style="background: #477edd">修改</el-button>
-                              <el-button type="primary" class="bt1" size="mini" style="background: #477edd">删除</el-button>
+                              <el-button type="primary" class="bt1" size="mini">修改</el-button>
+                              <el-button type="primary" class="bt1" size="mini">删除</el-button>
                           <!-- </el-button> -->
                       </div>
                   <!-- </template> -->
@@ -136,7 +136,6 @@
   <!-- 项目成员表格结束 -->
 
 
-            <!-- </div> -->
   <!-- 项目简介开始 -->
             <div class="tabTit">
                 <div>项目简介</div>
@@ -171,31 +170,31 @@
           :modal="false"
           :close-on-click-modal="false"
           class="AddMember"
-          :before-close="handleClose">
+          :before-close="init">
 
             <div class="littleBlock">
               <div class="dialogLabel">姓名</div>
               <div>
-                <el-input v-model="Member.name"></el-input>
+                <el-input v-model="data.Member.name"></el-input>
               </div>
             </div>
 
             <div class="littleBlock">
               <div class="dialogLabel">班级</div>
               <div>
-                <el-input v-model="Member.Class"></el-input>
+                <el-input v-model="data.Member.Class"></el-input>
               </div>
             </div>
 
             <div class="littleBlock">
               <div class="dialogLabel">电话</div>
               <div>
-                <el-input v-model="Member.phone"></el-input>
+                <el-input v-model="data.Member.phone"></el-input>
               </div>
             </div>
             <div slot="footer" class="footer">
               <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-              <el-button @click="handleClose" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+              <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
             </div>
       </el-dialog>
       <!--添加成员dialog对话框结束 -->
@@ -208,53 +207,36 @@
 <script>
 
     export default {
-      props:["data","next",'back'],
+      props:["data","next",'back','addPerson'],
       data() {
         return {
           input:"",
-          Member:{
-              name:'袁一鸣',
-              Class:'21通信',
-              phone:'1234567898'
-          },
+         
           addMemberDialog:false,
 
-          tableData:[{
-              Name:'徐晓慧',
-              Class:'22电子通信G5',
-              tel:'13751177411',
-            },
-            {
-              Name:'铠甲',
-              Class:'22电子通信G5',
-              tel:'13751177411',
-            },
-          ],
+          
         }
       },
       methods:{
-        handleClose(){
+        init(){
           this.addMemberDialog=false
         },
         addMember(){
           this.addMemberDialog=true
-         
         },
+
         // 上一步
         backBtn1(){
           this.$router.push('/projectApplication')
-          // this.data.name="娃哈哈"
         },
          // 下一步
          backBtn(){
             this.next();
         },
         commit(){
-          this.addMemberDialog=false;
-          let { name: Name, Class: Class, phone:tel } = this.Member;
-          let data={Name,Class,tel};
-          this.tableData.push(data);
-        }
+            this.addPerson();
+            this.init()
+        },
 
       },
       created(){

src/views/projectApplicationApply3.vue

@@ -36,7 +36,7 @@
               <el-button type="primary" class="addBtn">设置经费</el-button>
             </div>
             <el-table
-              :data="tableData"
+              :data="data.tableData"
               tooltip-effect="dark"
               stripe
               :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
@@ -130,7 +130,7 @@
               <el-button type="primary" @click="addBtn" class="addBtn">添加</el-button>
             </div>
             <el-table
-              :data="tableData2"
+              :data="data.tableData2"
               tooltip-effect="dark"
               stripe
               class="fontSize"
@@ -184,9 +184,9 @@
 
       <div class="dialogTop">
           <div class="dagSpan">项目名称</div>
-          <el-select style="width: 80%;" v-model="dialog.value" placeholder="请选择">
+          <el-select style="width: 80%;" v-model="data.dialog.projectName" placeholder="请选择">
             <el-option
-              v-for="item in options"
+              v-for="item in data.dialog.nameOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value">
@@ -195,9 +195,9 @@
       </div>
       <div class="dialogTop">
           <div class="dagSpan">项目类型</div>
-          <el-select v-model="dialog.value" placeholder="请选择">
+          <el-select v-model="data.dialog.type" placeholder="请选择">
             <el-option
-              v-for="item in options"
+              v-for="item in data.dialog.typeOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value">
@@ -212,15 +212,15 @@
       <div class="dagInpS">
         <div class="dagInpS1">
           <div class="dagSpan">支出类别</div>
-          <el-input v-model="dialog.sort" placeholder="请输入内容"></el-input>
+          <el-input v-model="data.dialog.sort" placeholder="请输入内容"></el-input>
         </div>
         <div class="dagInpS1">
           <div class="dagSpan">支出项目</div>
-          <el-input v-model="dialog.disburseProject" placeholder="请输入内容"></el-input>
+          <el-input v-model="data.dialog.disburseProject" placeholder="请输入内容"></el-input>
         </div>
         <div class="dagInpS1">
           <div class="dagSpan">金额(元)</div>
-          <el-input v-model="dialog.fund" placeholder="请输入内容"></el-input>
+          <el-input v-model="data.dialog.fund" placeholder="请输入内容"></el-input>
         </div>
       </div>
 
@@ -232,12 +232,12 @@
             resize="none"
             style="width: 80%;"
             placeholder="请输入内容"
-            v-model="dialog.textarea">
+            v-model="data.dialog.textarea">
           </el-input>
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="init" class="btn5">完成</el-button>
+        <el-button type="primary" @click="finish" class="btn5">完成</el-button>
       </div>
     </el-dialog>
     <!-- 经费明细添加按钮结束 -->
@@ -257,42 +257,21 @@ import { VueEditor } from "vue2-editor";
         return {
           addFundDialog:false,
           // 经费明细添加按钮对话框下拉框
-          options: [ 
-            {
-              value: '选项5',
-              label: '北京烤鸭'
-            }],
-          // 经费月支出计划
-          tableData:[{
-            projectName:'-',
-            date:'2022年11月12日',
-            size:'50k'
-            },
-          ],
-          // 经费明细
-          tableData2:[{
-            sort:'人工智能设备购买',
-            Fund:'20000.00',
-            projectName:'项目协作费用',
-            remark:''
-            },      
-          ],
-          dialog:{
-            textarea:'',
-            fund:'',
-            content:'',
-            value: '',   //下拉框
-            disburseProject:'',
-            sort:'',
-            projectName:''
-          }
+          
+          
+         
+          
         }
       },
       methods:{
+        
         init(){
           //重置
           this.addFundDialog=false;
         },
+        finish(){
+            this.init()
+        },
         backBtn(){
           // alert('333')
           this.next();

src/views/projectApplicationApplyMain.vue

@@ -20,12 +20,19 @@
 
       <!--下方内容区开始-->
       <div class="Main_area">
-        <projectApplicationApply :data="projectApplicationApply1" :next="next" :back="back" v-show="status==0"/>
+        <projectApplicationApply :data="projectApplicationApply1" :next="next" :addPerson="addPerson" :back="back" v-show="status==0"/>
         <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-show="status==1"/>
         <projectApplicationApply3 :data="projectApplicationApply3" :next="next" :back="back" :submitBtn="submitBtn" v-show="status==2"/> 
       </div>
       <!--下方内容区结束-->
 
+
+      
+
+
+
+
+
       <!-- 提交对话框开始 -->
         <el-dialog
           title="提示"
@@ -58,7 +65,6 @@
             status:0,
             submitHint:false,
             projectApplicationApply1:{   //立项基础信息
-                name:"sss",
                 select:{
                   projectName:'疯狂星期四',
                   person:'袁一鸣',
@@ -77,7 +83,23 @@
                     label: '中德学院'
                   },
                 ],
-                textarea:'每周星期四为活动时间'
+                textarea:'每周星期四为活动时间',
+                Member:{
+                    name:'袁一鸣',
+                    Class:'21通信',
+                    phone:'1234567898'
+                },
+                tableData:[{
+                    Name:'徐晓慧',
+                    Class:'22电子通信G5',
+                    tel:'13751177411',
+                  },
+                  {
+                    Name:'铠甲',
+                    Class:'22电子通信G5',
+                    tel:'13751177411',
+                  },
+                ],
             },
             projectApplicationApply2:{  //项目内容
                 contentOne:'疯狂星期四',
@@ -88,14 +110,70 @@
             },
             projectApplicationApply3:{  //预算经费
                 fund:"1000",
+                // 经费月支出计划
+                tableData:[{
+                  projectName:'-',
+                  date:'2022年11月12日',
+                  size:'50k'
+                  },
+                ],
+                 // 经费明细
+                tableData2:[{
+                  sort:'人工智能设备购买',
+                  Fund:'20000.00',
+                  projectName:'项目协作费用',
+                  remark:''
+                  },      
+                ],
+                //对话框
                 dialog:{
-                  projectName:'',
-
-                }
+                  textarea:'我不是南方姑娘的花裙子，不是傲寒在稻城快要融化的早晨，不是董小姐手中的那支兰州，不是郑州冬天的那缕阳光，不是杂货店老板娘手中的玫瑰，不是北方女王四川路过的江成都见过的湖，不是低苦艾的候鸟飞到的北方，不是祝星踩着的山河，可今天是肯德基疯狂星期四，谁请我吃？',
+                  fund:'300000',
+                  content:'',
+                  value: '',   //下拉框
+                  disburseProject:'肯德基',
+                  sort:'餐饮',
+                  type:'第三产业',
+                  projectName:'疯狂星期四',
+                  nameOptions: [ 
+                  {
+                    value: '1',
+                    label: '疯狂星期四'
+                  },
+                  {
+                    value: '2',
+                    label: '鱼稻共生'
+                  },
+                  {
+                    value: '3',
+                    label: '锻造钢铁'
+                  },
+                ],
+                  typeOptions: [ 
+                  {
+                    value: '1',
+                    label: '第一产业'
+                  },
+                  {
+                    value: '2',
+                    label: '第二产业'
+                  },
+                  {
+                    value: '3',
+                    label: '第三产业'
+                  },
+                ],
+                },
             }
           }
         },
         methods:{ 
+            addPerson(){
+              this.projectApplicationApply1.addMemberDialog=false;
+              let { name: Name, Class: Class, phone:tel } = this.projectApplicationApply1.Member;
+              let data={Name,Class,tel};
+              this.projectApplicationApply1.tableData.push(data);
+            },
             next(){
                 if(this.status>=2)return;
                 this.status++;
@@ -111,11 +189,12 @@
             },
             init(){
                 //重置
+                this.projectApplicationApply1.addMemberDialog=false
                 // this.dialogVisible=false;
                 this.submitHint=false;
                 // this.dialogVisible2=false;
             },
-
+            
         },
         created(){
         //   this.value=(this.options[0].value)