liuxiangqi пре 1 година
родитељ
комит
d5416e3065

BIN
src/assets/images/icon15.png


BIN
src/assets/images/icon16.png


+ 8 - 0
src/views/admin/project/index.vue

@@ -37,6 +37,14 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" style="width: 200px;" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
+      <el-form-item label="申报状态" prop="reportState">
+        <el-select v-model="queryParams.reportState" filterable style="width: 200px;" clearable>
+          <el-option value="1" label="待补充">待补充</el-option>
+          <el-option value="2" label="待申报">待申报</el-option>
+          <el-option value="3" label="待审核">待审核</el-option>
+          <el-option value="4" label="已申报">已申报</el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">搜索</el-button>
         <el-button @click="resetQuery">重置</el-button>

+ 15 - 13
src/views/common/registerFirst.vue

@@ -504,7 +504,8 @@ export default {
         ],
       },
       loading: false,
-      captchaOnOff: true
+      captchaOnOff: true,
+      returnFlag: true
     };
   },
   created() {
@@ -725,20 +726,21 @@ export default {
             validLicenseApi(this.form.license).then(res => {
               if(res.data) {
                 this.$message.error('统一社会信用代码已经存在,不可以重复注册');
-                return
+                this.loading = false;
+              }else {
+                registerEntApi(this.form).then(res => {
+                  const userName = this.form.userName;
+                  this.$alert("<font color='red'>您已注册成功,账户为统一信用代码,密码为默认123456。请等待审核通过后登录平台进行操作。</font>", '系统提示', {
+                    dangerouslyUseHTMLString: true,
+                    type: 'success'
+                  }).then(() => {
+                    this.$router.push("/login");
+                  }).catch(() => {});
+                }).catch(() => {
+                  this.loading = false;
+                })
               }
             })
-            registerEntApi(this.form).then(res => {
-              const userName = this.form.userName;
-              this.$alert("<font color='red'>您已注册成功,账户为统一信用代码,密码为默认123456。请等待审核通过后登录平台进行操作。</font>", '系统提示', {
-                dangerouslyUseHTMLString: true,
-                type: 'success'
-              }).then(() => {
-                this.$router.push("/login");
-              }).catch(() => {});
-            }).catch(() => {
-              this.loading = false;
-            })
           }
         }else {
           const a = []

+ 34 - 22
src/views/enterprise/project/components/year-edit.vue

@@ -192,7 +192,7 @@
           </el-col>
         </el-row>
       </template>
-      
+
     </el-form>
     <audit-project v-if="auditVisible" ref="auditProject" @refreshData="getList()"></audit-project>
   </div>
@@ -286,7 +286,10 @@ export default {
         techFlag: false,
         techInvest: undefined
       },
-      rules: {
+      rules: {
+        projectYear: [
+          { required: true, trigger: "change", message: "请选择申办加计年度"}
+        ],
         totoalPersons: [
           { required: true, trigger: "blur", message: "请输入职工总人数" },
           { validator: validNumber, trigger: 'blur'}
@@ -382,9 +385,14 @@ export default {
         this.$refs.auditProject.init(row.id)
       })
     },
+    //获取四个年度
     getYears(){
       let optionsArray = new Array();
       let years= new Date().getFullYear();
+      if(this.type == 'year') {
+        this.form.projectYear = years
+        this.handleYear(years)
+      }
       for(var i=years;i>=years-3;i--){
         let anOption = {};
         anOption.dictValue=i;
@@ -392,7 +400,6 @@ export default {
         optionsArray.push(anOption);
       }
       this.yearsOptions = optionsArray;
-      console.log(this.yearsOptions, "this.yearsOptions")
     },
     getLayDate(){
       let _self = this
@@ -411,34 +418,20 @@ export default {
         if(res.code == 200) {
           if(e) {
             this.form.projectYear = e
+          }else {
+            this.form.projectYear = new Date().getFullYear()
           }
-          console.log("$$$$$$$$$$$$")
+          let techScope = []
+          this.$set(this.form, 'techScopeArray', techScope)
           this.form.entName = res.data.entName
           this.form.linkName = res.data.linkName
           this.form.linkPhone = res.data.linkPhone
           this.form.linkMobile = res.data.linkMobile
-          this.form.techFlag = res.data.techFlag
           this.form.address = res.data.address
         }
       })
     },
-    getYearData(projectYear) {
-      getYearDataApi(projectYear, this.entId).then(res => {
-        this.form = res.data
-        this.form.fileName = '高新证书'
-        if(this.form.techStartDate && this.form.techEndDate) {
-          this.form.licenseTime = this.form.techStartDate + ' 至 ' + this.form.techEndDate
-        }
-        if(this.form.techScope) {
-          let techScope = this.form.techScope.split(',') || []
-          this.$set(this.form, 'techScopeArray', techScope)
-        }
-        if(this.form.industry) {
-          let industryArray = this.form.industry.split(',') || [];
-          this.$set(this.form, 'industryArray', industryArray);
-        }
-      })
-    },
+    //获取申办加计年度信息
     handleYear(e) {
       getYearApi(e).then(res => {
         if(res.data) {
@@ -460,6 +453,25 @@ export default {
         }
       })
     },
+    //根据企业id获取年度信息
+    getYearData(projectYear) {
+      getYearDataApi(projectYear, this.entId).then(res => {
+        this.form = res.data
+        this.form.fileName = '高新证书'
+        if(this.form.techStartDate && this.form.techEndDate) {
+          this.form.licenseTime = this.form.techStartDate + ' 至 ' + this.form.techEndDate
+        }
+        if(this.form.techScope) {
+          let techScope = this.form.techScope.split(',') || []
+          this.$set(this.form, 'techScopeArray', techScope)
+        }
+        if(this.form.industry) {
+          let industryArray = this.form.industry.split(',') || [];
+          this.$set(this.form, 'industryArray', industryArray);
+        }
+      })
+    },
+
     getList(year) {
       this.tableLoading = true;
       let params = {

+ 8 - 0
src/views/enterprise/project/index.vue

@@ -7,6 +7,14 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" style="width: 200px;" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
+      <el-form-item label="申报状态" prop="reportState">
+        <el-select v-model="queryParams.reportState" filterable style="width: 200px;" clearable>
+          <el-option value="1" label="待补充">待补充</el-option>
+          <el-option value="2" label="待申报">待申报</el-option>
+          <el-option value="3" label="待审核">待审核</el-option>
+          <el-option value="4" label="已申报">已申报</el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">搜索</el-button>
         <el-button @click="resetQuery">重置</el-button>

+ 66 - 7
src/views/index.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container home">
-    <h3 class="toolbar">
+    <!-- <h3 class="toolbar">
       <span class="title">数据累计</span>
-    </h3>
+    </h3> -->
+    <div class="page01-con page04-con mt20">
+      <h1 class="page01-title">
+        <img src="../assets/images/icon15.png"/>数据累计
+      </h1>
+    </div>
     <template v-if="userType == 'ADMIN'">
       <el-row :gutter="20">
         <el-col :span="8">
@@ -98,12 +103,22 @@
       </el-row>
     </template>
     <template v-if="roleTypeFlag">
-      <h3 class="toolbar">
+      <!-- <h3 class="toolbar">
         <span class="title">年度信息管理</span>
         <div class="tool">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleYear">添加加计年度基本信息</el-button>
         </div>
-      </h3>
+      </h3> -->
+      <div class="page01-con page04-con">
+        <h1 class="page01-title">
+          <img src="../assets/images/icon15.png"/>年度信息管理
+          <!-- <a>更多</a> -->
+          <a @click="handleYear">
+            <img src="../assets/images/icon16.png"/>
+            添加年度基本信息
+          </a>
+        </h1>
+      </div>
       <el-table v-loading="loading" :data="list" border>
         <el-table-column label="申报年度" prop="projectYear"></el-table-column>
         <el-table-column label="企业名称" prop="entName" align="center" width="180"/>
@@ -119,12 +134,19 @@
           </template>
         </el-table-column>
       </el-table>
-      <h3 class="toolbar mt10">
+      <!-- <h3 class="toolbar mt10">
         <span class="title">已申报项目</span>
         <div class="tool">
           <el-button type="text" size="mini" @click="$router.push('/project/project-declare')">查看更多</el-button>
         </div>
-      </h3>
+      </h3> -->
+      <div class="page01-con page04-con mt20">
+        <h1 class="page01-title">
+          <img src="../assets/images/icon15.png"/>已申报项目
+          <a @click="$router.push('/project/project-declare')">更多</a>
+        </h1>
+      </div>
+
       <el-table v-loading="loading" :data="declareList" border>
         <el-table-column label="申报年度" prop="projectYear"></el-table-column>
         <el-table-column label="项目起止时间" align="center">
@@ -212,7 +234,44 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style scoped lang="scss">
+
+  img {
+    border: none;
+    vertical-align: middle;
+    max-width: 100%;
+  }
+  .page04-con h1{
+  	text-align:left;
+    padding-left:20px;
+    padding-right:50px;
+  }
+  .page04-con h1 img{
+  	display:inline-block;
+    margin-right:10px;
+  }
+  .page04-con h1 span{
+  	float:right;
+    font-weight:normal;
+    margin-right:20px;
+    cursor:pointer;
+  }
+  .page04-con h1 a{
+  	float:right;
+    color:#fff;
+    font-weight:700;
+  }
+  .page01-title{
+  	background:#4882b5;
+    font-size:18px;
+    color:#fff;
+    font-weight:700;
+    margin-bottom:5px;
+  	text-align:center;
+    line-height:48px;
+    border-radius:6px;
+    display:block;
+  }
 .home {
   blockquote {
     padding: 10px 20px;

+ 5 - 2
src/views/login.vue

@@ -181,8 +181,11 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then((res) => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch((err) => {
+            this.$router.push({ path: this.redirect || "/" }).catch(()=>{
+              this.loading = false;
+            });
+          }).catch((err) => {
+            this.loading = false;
             this.errMsg = err
             if(err == -2) {
               this.pwdVisible = true