#

src/views/fundManage/makerfund.vue

@@ -163,7 +163,7 @@
 
                 <el-button disabled v-show="scope.row.state==0"  style="width: 74px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">完结</el-button>
                 <el-button  v-show="scope.row.state==1"  style="width: 74px;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">完结</el-button>
-                <el-button  v-show="scope.row.state==2" style="width: 74px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">已完结</el-button>
+                <el-button  v-show="scope.row.state==2" disabled style="width: 74px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">已完结</el-button>
 
               </div>
           </template>

src/views/projectApply/projectApplication.vue

@@ -307,7 +307,7 @@
           // 分页数据
           table:{
             total:0,
-            packageSize:8,
+            packageSize:7,
             currentPage:1
           },   
           tableData:[],    //列表数据

src/views/projectApply/projectApplicationApply.vue

@@ -20,7 +20,7 @@
         <div id="one" class="right">
             <div  class="vfpHeader">
               <div class="titleOne">项目立项申请</div>
-              <div class="smallTitle">申请开放时间为2023年××月××日9:00 &nbsp;  截止时间为2023年××月××日18:00</div>
+              <div class="smallTitle">申请开放时间为2023年4月4日9:00 &nbsp;  截止时间为2023年12月31日18:00</div>
               <el-button @click="backBtn1" type="primary" size="mini">返回</el-button>
             </div>
             <hr>

src/views/projectApply/projectApplicationApply3.vue

@@ -159,11 +159,27 @@
       <div class="dagInpS">
         <div class="dagInpS1">
           <div class="dagSpan">支出类别</div>
-          <el-input v-model="data.dialog.type"  placeholder="请输入内容"></el-input>
+          <!-- <el-input v-model="data.dialog.type"  placeholder="请输入内容"></el-input> -->
+          <el-select v-model="data.dialog.type" placeholder="请选择">
+              <el-option
+              v-for="item in expendType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.label">
+              </el-option>
+          </el-select>
         </div>
         <div class="dagInpS1">
           <div class="dagSpan">支出项目</div>
-          <el-input v-model="data.dialog.disburseProject" placeholder="请输入内容"></el-input>
+          <!-- <el-input v-model="data.dialog.disburseProject" placeholder="请输入内容"></el-input> -->
+          <el-select v-model="data.dialog.disburseProject" placeholder="请选择">
+              <el-option
+              v-for="item in expendProject"
+              :key="item.value"
+              :label="item.label"
+              :value="item.label">
+              </el-option>
+          </el-select>
         </div>
         <div class="dagInpS1">
           <div class="dagSpan">金额(元)</div>
@@ -197,77 +213,99 @@
           :close-on-click-modal="true"
           class="AddFund"
           :before-close="init">
-     
+          <div style="position: absolute;top:10px;font-size: 18px;">经费月支出计划(元)</div>
             <div class="littleBlock">
               <div class="dialogLabel">一月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" class="inputNumber" v-model.number="data.items.one"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"   class="inputNumber" v-model.number="data.items.one"></el-input>
+                <span class="yuan">(元)</span>
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">二月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.two"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.two"></el-input>
+                <span class="yuan">(元)</span>
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">三月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.three"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.three"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">四月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.four"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.four"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">五月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.five"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.five"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">六月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.six"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.six"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">七月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.seven"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.seven"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">八月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.eight"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.eight"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">九月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.nine"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.nine"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">十月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.ten"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.ten"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">十一月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.eleven"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.eleven"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock">
               <div class="dialogLabel">十二月</div>
-              <div>
-                <el-input type="number" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))" v-model="data.items.twelve"></el-input>
+              <div class="littleBlockInp">
+                <el-input type="number"  v-model="data.items.twelve"></el-input>
+                <span class="yuan">(元)</span>
+
               </div>
             </div>
             <div class="littleBlock" style="width: 100%;">
@@ -284,8 +322,8 @@
               </div>
             </div>
             <div slot="footer" class="footer">
-              <el-button type="primary" @click="commit" class="diaBtn" >确认提交</el-button>
-              <el-button @click="init" class="diaBtn">取消</el-button>
+              <el-button type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
+              <el-button @click="init" class="AllDialogBtn">取消</el-button>
             </div>
       </el-dialog>
       <!--设置经费dialog对话框结束 -->
@@ -345,10 +383,46 @@ import { VueEditor } from "vue2-editor";
           ],
           
           // 经费明细添加按钮对话框下拉框
+          expendType:[
+              {
+                  value:1,
+                  label:'个人创客'
+              },
+              {
+                  value:2,
+                  label:'活动创客'
+              },
+          ],
+          expendProject:[
+              {
+                  value:1,
+                  label:'小型仪器设备费'
+              },
+              {
+                  value:2,
+                  label:'材料费'
+              },
+              {
+                  value:3,
+                  label:'测试化验加工费'
+              },
+              {
+                  value:4,
+                  label:'项目协作费'
+              },
+              {
+                  value:5,
+                  label:'其他支出'
+              },
+          ]
         }
       },
       methods:{
-        
+        judge(event){
+          console.log(event);
+          // console.log(111);
+          // return (/[\d]/.test(String.fromCharCode(event.keyCode)));
+        },
         init(){
           this.addFundDialog=false
           this.setFund=false;
@@ -388,23 +462,6 @@ import { VueEditor } from "vue2-editor";
               Object.assign(this.data.tableData2[this.data.dialog['index']],this.data.dialog)
               for(let k in this.data.dialog) this.data.dialog[k]=''
               return this.addFundDialog=false;
-              
-                  // Object.assign(this.data.dialog,this.data.tableData2[])
-                  // this.data.tableData2.forEach((e,i,arr) => {
-                  //     if (e.id == this.iid.id) {
-                  //       // if(this.data2.select.fund == '' || this.data2.select.fund==undefined )return this.$message.error('请输入项目预算总经费')
-                  //       if (this.data.dialog.type=="" || this.data2.select.fund==undefined ) return this.$message.error('请输入支类别')
-                  //       if (this.data.dialog.disburseProject=="" || this.data2.select.fund==undefined ) return this.$message.error('请输入支出项目')
-                  //       if (this.data.dialog.fund=="" || this.data2.select.fund==undefined ) return this.$message.error('请输入金额')
-
-                  //       
-                  //       arr.splice(i,1,this.data.dialog)
-                  //       this.data.dialog={}
-                  //       this.recompose=0          
-                  //       return this.init()
-                  //     }
-                  // });
-                  // return false
             }
             let oldDia={}   //添加数据防止污染
             // 添加
@@ -423,13 +480,10 @@ import { VueEditor } from "vue2-editor";
             oldMoney+=this.data.dialog.fund;   //因为本次的数据还未添加到列表中，所以直接在这里进行相加判断
 
             if(oldMoney>(this.data2.select.fund)*10000)return this.$message.error('经费明细超出预算总金额');
-            // let p=this.projectApplicationApply3;
-              // p.dialog.id=uuid.v1();
-            // console.log(this.data.dialog);
+           
             Object.assign(oldDia,this.data.dialog)
             this.data.tableData2.push(oldDia);
             for(let k in this.data.dialog) this.data.dialog[k]='';
-            // console.log(this.data.tableData2);
             this.addFundDialog=false;
         },
         setFundBtn(){    //经费月支出计划设置经费对话框显示
@@ -565,6 +619,7 @@ import { VueEditor } from "vue2-editor";
         .el-dialog__body{
           display: flex;
           align-items: center;
+          position: relative;
           justify-content: flex-start;
           flex-wrap: wrap;
           margin-left: 40px;
@@ -583,9 +638,18 @@ import { VueEditor } from "vue2-editor";
         .littleBlock{   //添加对话框 label和input框
             display: flex;
             margin-top: 20px;
-            margin-right: 15px;
+            margin-right: 57px;
             flex-shrink: 0;
-            width: 22%;
+            width: 24%;
+            .littleBlockInp{
+              position: relative;
+              .yuan{
+                position: absolute;
+                top: 7px;
+                right: -30px;
+                font-size: 16px;
+              }
+            }
             .dialogLabel{     //label
               min-width: 50px;
               font-size: 16px;