yuanyiming 2 년 전
부모
커밋
a02d2a3a42

+ 15 - 10
src/views/projectApply/projectApplication.vue

@@ -12,7 +12,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 options.projectFilter"
             :key="item.courseId"
@@ -25,7 +25,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 options.department"
             :key="item.classid"
@@ -38,7 +38,7 @@
       <div class="selectsBlock">
         <div class="selectLabel">分类</div>
         <el-select v-model="selectInp.sort" @change="getData" placeholder="请选择">
-          <el-option label="所有分类" :value="0"></el-option>
+          <el-option label="所有分类" value=""></el-option>
           <el-option
             v-for="item in options.sort"
             :key="item.typeid"
@@ -51,7 +51,7 @@
       <div class="selectsBlock">
         <div class="selectLabel">负责人</div>
         <el-select v-model="selectInp.person" @change="getData" placeholder="请选择">
-          <el-option label="所有负责人" :value="''"></el-option>
+          <el-option label="所有负责人" value=""></el-option>
           <el-option
             v-for="(item,index) in options.person"
             :key="index"
@@ -154,7 +154,6 @@
                   <!-- <el-button type="primary" > -->
                     <!-- <el-link class="btt" type="primary" :underline="false"> -->
                         <el-button type="primary"  size="mini" @click="lookDetail(scope.row.courseId)">查看详情</el-button>
-                        <!-- <el-button type="primary"  size="mini" @click="audit(scope.row)">{{(status==-1?"审核": status?"撤回":"审核")}}</el-button> -->
                         <!-- <el-button type="primary"  size="mini" @click="audit(scope.row)">{{(scope.row.data==1?"审核": scope.row.data==1?"正在审核":"审核")}}</el-button> -->
                         <el-button v-show="scope.row.isupload==0" type="primary" style="width: 73.3px;" size="mini" @click="audit(scope.row)">审核</el-button>
                         <el-button type="info" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" v-if="scope.row.isupload==1"  size="mini">审核中</el-button>
@@ -314,11 +313,11 @@
           tableData:[],    //列表数据
           
           selectInp:{  // 头部搜索框的内容
-            filter:0,
-            department:0,
-            sort:0,
+            filter:'',
+            department:'',
+            sort:'',
             person:'',
-            state:99,
+            state:'',
           },
           options:{    //头部搜索框下拉框数据
             projectFilter:[],//项目筛选
@@ -327,7 +326,7 @@
             person:[],//负责人
             state:[//状态
               {
-                value:99,
+                value:'',
                 label:'全部'
               },
               {
@@ -451,6 +450,12 @@
                 a.sort=data[3];
                 a.person=data[4];
                 this.table.total=data[5][0].total
+                // this.tableData=data[0];
+                // a.projectFilter=data[2];
+                // a.department=data[3];
+                // a.sort=data[4];
+                // a.person=data[5];
+                // this.table.total=data[5][0].total
               },err=>{
                 console.log(err);
               })  

+ 5 - 17
src/views/projectApply/projectApplicationApply.vue

@@ -289,24 +289,23 @@
             this.dialogVisible = true;
         },
         getText(value) {     //电话验证
-          // console.log(value);
-          // let text = document.getElementById(inputId).value; //获取输入框的ID 存放到text变量中
           let verify = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
           let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
           // if(!result && value != "") {
+            // debugger
           if(!result) {
             if (value == this.data.select.tel) {
                 this.$message.error('请输入正确联系号码格式')
                 return  this.data.telVerify=false;
             }
-            if (value == this.data.Member.phone || value == this.data.Member2.phone) {
-              return  this.data.telVerify2=false;
+            if (value == this.data.Member.phone) {
+                return  this.data.telVerify2=false;
             }
           }else{
             if (value == this.data.select.tel) {
                  this.data.telVerify=true;
             }
-            if (value == this.data.Member.phone || value == this.data.Member2.phone) {
+            if (value == this.data.Member.phone) {
               return  this.data.telVerify2=true;
             }
           }
@@ -351,13 +350,7 @@
           this.data.tableData.splice(a,1);
           this.$message.success('删除成功');
           this.delMember=false;
-          // this.data.tableData.forEach((item, index, arr)=> {
-          //     if(item.id === a) {
-          //         arr.splice(index, 1);
-          //         this.$message.success('删除成功')
-          //         this.init()
-          //     }
-          // });
+        
         },
         backBtn1(){  // 上一步
           this.$router.push('/projectApplication')
@@ -395,11 +388,6 @@
             }
         }
       },
-
-      mounted(){
-        // console.log(this.data)
-        
-      }
     }
 </script>
 

+ 3 - 11
src/views/projectApply/projectApplicationApplyMain.vue

@@ -61,8 +61,8 @@
             projectApplicationApply1:{   //立项基础信息页面
               amendMemberDialog:false,  //修改人员对话框显示判断
                 dialogImageUrl:"",  //封面
-                telVerify:'',
-                telVerify2:'',  //添加修改成员电话判断
+                telVerify:true,
+                telVerify2:true,  //添加修改成员电话判断
                 select:{    //基本信息数据框
                   projectName:'', 
                   person:'',
@@ -186,7 +186,6 @@
 
             init(){
                 //重置
-                // this.projectApplicationApply1.addMemberDialog=false
                 this.submitHint=false;
                 
             },
@@ -197,12 +196,10 @@
                   data.items[key]='-'
                 }
               }
-              // Object.assign(data.items2,data.items)   //如果提交后不用清除数据的话,这句不用写也行的,直接添加data.items
                Object.assign(data.tableData[0],data.items)              
               },
 
             submitBtn(){   //预算经费页面提交显示对话框
-                // console.log("提交啦");
                 this.submitHint = true;
             },
             submitAll(){
@@ -220,12 +217,7 @@
               if(a.select.tel=='') return this.$message.error('请输入联系电话')
               if(!a.telVerify) return this.$message.error('请输入正确联系电话格式')
               if(a.select.sort=='') return this.$message.error('请选择分类')
-              // if(a.textarea=='') return this.$message.error('请输入项目简介')
-              // if(b.contentOne=='') return this.$message.error('请输入项目创新点')
-              // if(b.contentTwo=='') return this.$message.error('请输入预期取得成果')
-              // if(b.contentThree=='') return this.$message.error('请输入预期取得成果')
-              // if(b.contentFour=='') return this.$message.error('请输入预期取得成果')
-              // if(b.contentFive=='') return this.$message.error('请输入项目实施计划')
+              
               let d=[]   //按照后端格式传递数据,项目内容,要将经费支出,与项目明细放在一起,
               for(let key in b){
                   d.push(b[key])

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

@@ -13,7 +13,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">项目筛选</span>
         <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 options.projectFilter"
             :key="item.courseId"
@@ -26,7 +26,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">部门</span>
         <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 options.department"
             :key="item.classid"
@@ -39,7 +39,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">分类</span>
         <el-select v-model="selectInp.sort" @change="getData" placeholder="请选择">
-          <el-option label="所有分类" :value="0"></el-option>
+          <el-option label="所有分类" value=""></el-option>
           <el-option
             v-for="item in options.sort"
             :key="item.typeid"
@@ -64,7 +64,7 @@
       <div class="selectsBlock">
         <span class="selectLabel">负责人</span>
         <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 options.person"
             :key="index"
@@ -196,7 +196,7 @@ import beUpload from '../../components/tool/beUpload'
             person:[],//负责人
             state:[//状态
               {
-                value:99,
+                value:'',
                 label:'全部'
               },
               {
@@ -214,10 +214,10 @@ import beUpload from '../../components/tool/beUpload'
             ],
           },
           selectInp:{     //select选定所显示的值 
-            filter:0,     //不要带引号,select框是根据id来选择下面数据的
-            department:0,
-            sort:0,
-            state:99,
+            filter:'',     //不要带引号,select框是根据id来选择下面数据的
+            department:'',
+            sort:'',
+            state:'',
             leader:'',
           },
         
@@ -298,7 +298,7 @@ import beUpload from '../../components/tool/beUpload'
               .then(res=>{
                 // console.log(res);
                 let data=res.data;
-                // console.log(res);
+                console.log(data);
                 let a=this.options;
                 this.items=data[0];
                 // console.log(this.items);