yuanyiming 2 年 前
コミット
7063e17701

+ 4 - 4
src/App.vue

@@ -8,7 +8,6 @@
           <div class="homeExit" @click="homeExit">退出</div>
         </div>
       </el-header>
-
     <router-view></router-view>
   </div>
 </template>
@@ -87,7 +86,7 @@
     margin-bottom: 15px;
     .pAHeader1{
       font-weight: 600;
-      font-size: 22px;
+      font-size: 26px;
       text-align: left;
     }
     [type='button']{
@@ -222,7 +221,8 @@
   .select{ //活动申请填写信息区域
           width: 100%;
           box-sizing: border-box;
-          margin-top: 16px;
+          margin-top: 30px;
+          // margin-bottom: 8px;
           .label{   //label标签
             min-width: 98px;
             margin-right: 5px;
@@ -529,7 +529,7 @@
           }
         }
       }
-      .paginations{
+      .paginations{   //分页栏
           position: relative;
           display: flex;
           justify-content: flex-end;

+ 2 - 2
src/views/activityManage/makerActvityDetails.vue

@@ -203,7 +203,7 @@
             </div>
 
 
-            <!--添加成员dialog对话框开始 -->
+            <!--修改成员dialog对话框开始 -->
               <el-dialog
                   :title="isAddTeacher?'添加指导老师':'修改指导老师信息'"
                   :visible.sync="addMemberDialog"
@@ -236,7 +236,7 @@
                       <el-button @click="handleClose" class="diaBtn" size="small">取消</el-button>
                     </div>
               </el-dialog>
-            <!--添加成员dialog对话框结束 -->
+            <!--修改成员dialog对话框结束 -->
                   <!-- 提交对话框开始 -->
                   <el-dialog
                     title="提示"

+ 4 - 16
src/views/firm.vue

@@ -1,6 +1,9 @@
 <template>
   <!-- 创业公司登记 -->
   <div class="firm">
+    <!-- <div class="pAHeader"> -->
+      <!-- <div class="pAHeader1">创业公司登记</div> -->
+    <!-- </div> -->
     <div class="pAHeader">
       <div class="pAHeader1">创业公司登记</div>
     </div>
@@ -286,22 +289,7 @@ export default {
   width: 100%;
   height: 100%;
   position: relative;
-  .pAHeader {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    .pAHeader1 {
-      width: 150px;
-      font-weight: 600;
-      flex-shrink: 0;
-      font-size: 22px;
-    }
-    .pAHeader2 {
-      height: 35px;
-      line-height: 5px;
-      background: #477edd;
-    }
-  }
+
 
   .addDialog {
 

+ 2 - 0
src/views/home.vue

@@ -108,6 +108,8 @@
               // text-align: center;
               // overflow: hidden ;
               margin-left: 20px;
+              box-sizing: border-box;
+              padding: 30px;
               border-radius: 5px;
             }
         }

+ 8 - 3
src/views/projectApply/projectApplication2.vue

@@ -46,7 +46,10 @@
       </div>
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary"  @click="audit">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==1"  @click="audit">立即修改</el-button>
+          <el-button type="primary" style="background: #ccc !important;border: none;" v-show="isUpload==2"  @click="$message.error('项目已结项,不可再修改')">立即修改</el-button>
+
         </div>
       </div>
       <!-- 修改对话框开始 -->
@@ -76,6 +79,7 @@ import { VueEditor } from "vue2-editor";
         },
         data() {
           return {
+            isUpload:'',
             data:[["","","","",""],[]],
             submitHint:false,
             customToolbar: [
@@ -123,9 +127,10 @@ import { VueEditor } from "vue2-editor";
               this.ajax
                     .get(this.$store.state.api+'/GetProjectDetailMessage',param)
                     .then(res=>{
-                      // console.log(res);
+                      // console.log(res.data[0][0].isupload);
+                      this.isUpload=res.data[0][0].isupload;
                       let GetData=JSON.parse(res.data[0][0].chapters)
-                      console.log(GetData);
+                      // console.log(GetData);
                       this.data=GetData
                     },err=>{
                       console.log(err);

+ 1 - 1
src/views/projectApply/projectApplicationApplyMain.vue

@@ -413,7 +413,7 @@
         width: 83%;
         background: #fff;
         box-sizing: border-box;
-        padding: 15px 20px;
+        padding: 15px 30px;
         min-height: 740px;
         margin-bottom: 60px;
         border-radius: 5px;

+ 7 - 2
src/views/projectApply/projectApplicationDetails.vue

@@ -180,7 +180,10 @@
 
     <div class="baseBtn">
       <div class="blockWidth">
-        <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button>
+        <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="audit">立即修改</el-button>
+        <el-button v-show="isUpload==1" type="primary" class="backBtn" @click="audit">立即修改</el-button>
+        <el-button v-show="isUpload==2" type="primary" class="backBtn" style="background: #ccc !important;border: none;"  @click="this.$message.error('项目已结项,不可再修改')">立即修改</el-button>
+
       </div>
     </div>
       <!--添加成员dialog对话框开始 -->
@@ -270,6 +273,7 @@
       data() {
         return {
           iid:'',
+          isUpload:'',
           accept:"image/*",
           isAddMember:1,
           dialogImageUrl:'',  //图片地址
@@ -432,7 +436,7 @@
             this.ajax
                   .get(this.$store.state.api+'/GetProjectBase',param)
                   .then(res=>{
-                    // console.log(res);
+                    console.log(res.data);
                     let data=res.data[0][0]
                     this.select.project=data.title;
                     this.select.Fund=data.money;
@@ -444,6 +448,7 @@
                     this.dialogImageUrl=data.image
                     this.select.departmentData = data['classid']
                     this.select.sort = data['typeid']
+                    this.isUpload=data['isupload']
                   },err=>{
                     console.log(err);
                   })