yuanyiming 2 éve
szülő
commit
0b38491bc5

+ 12 - 12
src/views/fundManage/makerfund.vue

@@ -11,7 +11,7 @@
       <div class="selectsBlock">
         <div class="selectLabel">项目筛选</div>
         <el-select v-model="selectInp.filter" @change="getData" placeholder="我的项目">
-          <el-option label="所有项目" :value="0"></el-option>
+          <el-option label="所有项目" value=""></el-option>
           <el-option
             v-for="item in filterSelects"
             :key="item.id"
@@ -24,7 +24,7 @@
       <div class="selectsBlock">
         <div class="selectLabel">部门</div>
         <el-select v-model="selectInp.department" @change="getData" placeholder="请选择">
-          <el-option label="所有部门" :value="0"></el-option>
+          <el-option label="所有部门" value=""></el-option>
           <el-option
             v-for="item in departmentSelect"
             :key="item.id"
@@ -37,12 +37,12 @@
       <div class="selectsBlock">
         <div class="selectLabel">分类</div>
         <el-select v-model="selectInp.type" @change="getData" placeholder="请选择">
-          <el-option label="所有分类" :value="0"></el-option>
+          <el-option label="所有分类" value=""></el-option>
           <el-option
             v-for="item in typeSelects"
             :key="item.value"
             :label="item.label"
-            :value="item.value">
+            :value="item.label">
           </el-option>
         </el-select>
       </div>
@@ -50,7 +50,7 @@
       <div class="selectsBlock">
         <div class="selectLabel">负责人</div>
         <el-select v-model="selectInp.leader" @change="getData" placeholder="请选择">
-          <el-option label="所有负责人" :value="''"></el-option>
+          <el-option label="所有负责人" value=""></el-option>
           <el-option
             v-for="(item,index) in leaderSelects"
             :key="index"
@@ -63,7 +63,7 @@
       <div class="selectsBlock">
         <div class="selectLabel">状态</div>
         <el-select v-model="selectInp.status" @change="getData" placeholder="请选择">
-          <el-option label="所有状态" :value="99"></el-option>
+          <el-option label="所有状态" value=""></el-option>
           <el-option
             v-for="item in statusSelects"
             :key="item.value"
@@ -425,11 +425,11 @@
           departmentSelect:[],
           typeSelects:[
             {
-              value:'0',
+              value:0,
               label:'个人创客'
             },
             {
-              value:'1',
+              value:1,
               label:'活动创客'
             }
           ],
@@ -458,11 +458,11 @@
           },
           ],
           selectInp:{    //搜索下拉框的值
-            filter:0,
-            department:0,
-            type:0,
+            filter:'',
+            department:'',
+            type:'',
             leader:'',
-            status:99
+            status:''
           }
         }
       },

+ 9 - 5
src/views/fundManage/makerfundApply.vue

@@ -414,11 +414,15 @@ export default {
             if(this.selects.projectName=='') return this.$message.error('请选择项目名称')
             if(this.selects.projectType=='') return this.$message.error('请选择项目类型')
 
-            let num=0;
-            let sum = this.directFundBlock.reduce((per,cur)=>{
-                return per+cur[budget]
+            let dirSum = this.directFundBlock.reduce((per,cur)=>{
+                return per*1+cur.budget*1
+            },0)
+            console.log(dirSum);
+            let indirSum =this.indirectFundBlock.reduce((per,cur)=>{
+                return per*1+cur.budget*1
             })
-            console.log(sum);
+            console.log(indirSum);
+            return
             // return
             let param={
                 uid:this.$store.state.userInfo.userid,
@@ -452,7 +456,7 @@ export default {
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFundSelects',{uid:this.$store.state.userInfo.userid})
                 .then(res=>{
-                    console.log(res.data);
+                    // console.log(res.data);
                     this.projectFilter=res.data[0]
                 },err=>{
                     console.log(err);

+ 1 - 1
src/views/projectManage/ProjectManagement.vue

@@ -173,7 +173,7 @@ import beUpload from '../../components/tool/beUpload'
       components:{beUpload},
       data() {
         return {
-          accept:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+          accept:"*",
           iid:'',
           selectText:'',   //文字搜素框数据
           endDialog:false,

+ 1 - 1
src/views/projectManage/ProjectManagement4.vue

@@ -110,7 +110,7 @@
         components: { beUpload, vpdf, vword },
         data() {
           return {
-          accept:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+          accept:"*",
             table:{         // 分页数据
               total:0,
               packageSize:8,

+ 1 - 1
src/views/projectManage/ProjectManagement5.vue

@@ -112,7 +112,7 @@
         components: { beUpload, vpdf, vword },
         data() {
           return {
-          accept:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+          accept:"*",
             table:{         // 分页数据
               total:0,
               packageSize:8,