刘湘琪 2 years ago
parent
commit
b0cb2048ff

BIN
src/assets/images/cancel.png


+ 42 - 12
src/views/common/registerFirst.vue

@@ -1,8 +1,16 @@
 <template>
 <template>
-  <div class="register">
-    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form" label-width="190px">
-      <h3 class="title">注册信息</h3>
-      <el-collapse v-model="activeName">
+  <div class="app-container">
+    <div class="top-fixed">
+      <div class="title-reg">
+        <h3 class="title">注册信息</h3>
+        <div class="top-img" @click="cancel">
+          <img src='../../assets/images/cancel.png'>
+        </div>
+      </div>
+    </div>
+    <div class="content">
+      <el-form ref="registerForm" :model="registerForm" :rules="registerRules" label-width="190px">
+      <el-collapse v-model="activeNames">
         <template v-if="tokenVisile">
         <template v-if="tokenVisile">
           <el-collapse-item title="账户信息" name="1">
           <el-collapse-item title="账户信息" name="1">
             <el-row :gutter="40">
             <el-row :gutter="40">
@@ -331,8 +339,8 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-
-    </el-form>
+    </el-form>
+    </div>
     <!--  底部  -->
     <!--  底部  -->
     <div class="el-register-footer">
     <div class="el-register-footer">
       <span>Copyright © 2022 All Rights Reserved.</span>
       <span>Copyright © 2022 All Rights Reserved.</span>
@@ -383,7 +391,7 @@ export default {
       },
       },
       dialogVisible: false,
       dialogVisible: false,
       dialogImageUrl: "",
       dialogImageUrl: "",
-      activeName: '1',
+      activeNames: ['1','2','3','4','5','6','7','8','9','10', '11'],
       provinceName: '',
       provinceName: '',
       attachType: 'ENT',
       attachType: 'ENT',
       dataId: '',
       dataId: '',
@@ -722,7 +730,7 @@ export default {
         if(res.data) {
         if(res.data) {
           this.$message.error('统一社会信用代码已经存在,不可以重复注册');
           this.$message.error('统一社会信用代码已经存在,不可以重复注册');
           return
           return
-        }   
+        }
       })
       })
       this.$refs.registerForm.validate(valid => {
       this.$refs.registerForm.validate(valid => {
         if (valid) {
         if (valid) {
@@ -767,12 +775,34 @@ export default {
 };
 };
 </script>
 </script>
 
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss">
+  .title-reg {
+    position: fixed;
+    z-index: 999;
+    top: 0;
+    right: 0;
+    left: 0;
+    width: 100%;
+    height: 45px;
+    line-height: 45px;
+    padding: 20px;
+    background-color: #1890ff;
+    img {
+      left: 0;
+    }
+  }
+  .top-fixed {
+    width: 100%;
+    height: 45px;
+  }
+  .top-img {
+    float: right;
+    margin-top: -64px;
+  }
 .register {
 .register {
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
-  align-items: center;
-  // height: 100%;
+  align-items: center;
   height: 900px;
   height: 900px;
   overflow-y: auto;
   overflow-y: auto;
   scroll-behavior: auto;
   scroll-behavior: auto;
@@ -782,7 +812,7 @@ export default {
 .title {
 .title {
   margin: 0px auto 30px auto;
   margin: 0px auto 30px auto;
   text-align: center;
   text-align: center;
-  color: #707070;
+  color: #FFFFFF;
 }
 }
 
 
 .register-form {
 .register-form {

+ 8 - 8
src/views/enterprise/declare/index.vue

@@ -59,14 +59,14 @@
     </h3>
     </h3>
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange" style="width: 100%">
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange" style="width: 100%">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目编号" prop="projectNo" width="150" align="center" />
-      <el-table-column label="项目名称" prop="projectName" align="center" width="150"></el-table-column>
-      <el-table-column label="企业名称" prop="entName" align="center" width="150"/>
-      <el-table-column label="社会信用代码" prop="license" align="center" width="150" />
-      <el-table-column label="项目年份" prop="projectYear" align="center" width="150" />
-      <el-table-column label="项目跨年" prop="overYearFlag" align="center" width="150"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160"></el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="项目编号" prop="projectNo" align="center" />
+      <el-table-column label="项目名称" prop="projectName" align="center"></el-table-column>
+      <el-table-column label="企业名称" prop="entName" align="center"/>
+      <el-table-column label="社会信用代码" prop="license" align="center"/>
+      <el-table-column label="项目年份" prop="projectYear" align="center"/>
+      <el-table-column label="项目跨年" prop="overYearFlag" align="center"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime"></el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <el-button type="text" @click="handleView(scope.row)">查看</el-button>
           <el-button type="text" @click="handleView(scope.row)">查看</el-button>
           <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
           <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>