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

+ 3 - 0
src/assets/styles/index.scss

@@ -840,3 +840,6 @@ $border: #ddd;
 .th_tips {
   color: #4882B5;
 }
+.el-table {
+  font-size: 15px;
+}

+ 1 - 1
src/assets/styles/ruoyi.scss

@@ -78,7 +78,7 @@
 			background-color: #f8f8f9;
 			color: #515a6e;
 			height: 40px;
-			font-size: 14px;
+			font-size: 15px;
 		}
 	}
 	.el-table__body-wrapper {

+ 6 - 3
src/views/enterprise/ent/edit.vue

@@ -5,7 +5,7 @@
       <el-form ref="form" :model="form" :rules="registerRules">
         <table class="table_register media">
           <tr>
-            <th rowspan="6" style="width: 10%;" class="th_tips">企业信息</th>
+            <th rowspan="6" style="width: 12%;" class="th_tips">企业信息</th>
             <th style="width: 20%;"><span style="color: red;">*</span>企业名称</th>
             <td>
               <el-form-item label-width="0" prop="entName">
@@ -300,7 +300,7 @@
             </td>
           </tr>
           <tr>
-            <th class="th_tips">其他附件</th>
+            <th>其他附件</th>
             <td colspan="3">
               <el-form-item prop="attachIds" label-width="0">
                 <el-upload
@@ -320,7 +320,7 @@
             </td>
           </tr>
           <tr>
-            <th>文件水印</th>
+            <th class="th_tips">文件水印</th>
             <th>文件水印</th>
             <td colspan="3">
               <el-form-item label-width="0" prop="logo" ref="logoUpload">
@@ -938,6 +938,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .th_tips {
+    color: #4882B5;
+  }
   .app-container {
     overflow: auto;
   }

+ 1 - 1
src/views/enterprise/ent/index.vue

@@ -104,7 +104,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审核状态" prop="authState" align="center" width="120" :formatter="authStateFormat"></el-table-column>
-      <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" @click="handleView(scope.row)">查看</el-button>
           <!-- 只有科德管理员才可以有以下操作 -->

+ 17 - 5
src/views/enterprise/project/components/ent-edit.vue

@@ -78,10 +78,14 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="性别" prop="sex" align="center" width="80">
+              <el-table-column label="性别" prop="sex" align="center" width="120">
                 <template slot-scope="scope">
                   <el-form-item label-width="0" :prop="'headAddVOList.'+scope.$index+'.sex'">
-                    <el-input v-model="scope.row.sex"></el-input>
+                    <!-- <el-input v-model="scope.row.sex"></el-input> -->
+                    <el-select v-model="scope.row.sex">
+                      <el-option value="男">男</el-option>
+                      <el-option value="女">女</el-option>
+                    </el-select>
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -99,10 +103,18 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="学历" prop="education" align="center" width="80">
+              <el-table-column label="学历" prop="education" align="center" width="150">
                 <template slot-scope="scope">
                   <el-form-item label-width="0" :prop="'headAddVOList.'+scope.$index+'.education'">
-                    <el-input v-model="scope.row.education"></el-input>
+                    <!-- <el-input v-model="scope.row.education"></el-input> -->
+                    <el-select v-model="scope.row.education">
+                      <el-option value="小学">小学</el-option>
+                      <el-option value="初中">初中</el-option>
+                      <el-option value="高中">高中</el-option>
+                      <el-option value="大学(本科/专科)">大学(本科/专科)</el-option>
+                      <el-option value="硕士研究生">硕士研究生</el-option>
+                      <el-option value="博士">博士</el-option>
+                    </el-select>
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -456,7 +468,7 @@ export default {
     getYears(){
       let optionsArray = new Array();
       let years= new Date().getFullYear();
-      for(var i=years-3;i<=years;i++){
+      for(var i=years;i>=years-3;i--){
         let anOption = {};
         anOption.dictValue=i;
         anOption.dictLabel=i;

+ 16 - 5
src/views/enterprise/project/components/year-edit.vue

@@ -370,13 +370,14 @@ export default {
     getYears(){
       let optionsArray = new Array();
       let years= new Date().getFullYear();
-      for(var i=years-3;i<=years;i++){
+      for(var i=years;i>=years-3;i--){
         let anOption = {};
         anOption.dictValue=i;
         anOption.dictLabel=i;
         optionsArray.push(anOption);
       }
       this.yearsOptions = optionsArray;
+      console.log(this.yearsOptions, "this.yearsOptions")
     },
     getLayDate(){
       let _self = this
@@ -389,9 +390,14 @@ export default {
         }
       })
     },
-    getEntData() {
+    getEntData(e) {
       listEntUserApi().then(res => {
+        this.form = {}
         if(res.code == 200) {
+          if(e) {
+            this.form.projectYear = e
+          }
+          console.log("$$$$$$$$$$$$")
           this.form.entName = res.data.entName
           this.form.linkName = res.data.linkName
           this.form.linkPhone = res.data.linkPhone
@@ -434,6 +440,8 @@ export default {
             let industryArray = this.form.industry.split(',') || [];
             this.$set(this.form, 'industryArray', industryArray);
           }
+        }else {
+          this.getEntData(e)
         }
       })
     },
@@ -510,7 +518,7 @@ export default {
               })
             }
           }).catch(() => {
-              _self.loading = false      
+              _self.loading = false
           });
         }
       })
@@ -518,9 +526,12 @@ export default {
   },
   watch: {
     'tempVariable'(val) {
-      if(val.invest && val.sales) {
-        this.form.techRate = ((val.invest / val.sales)*100).toFixed(2)
+      if(val) {
+        if(val.invest && val.sales) {
+          this.form.techRate = ((val.invest / val.sales)*100).toFixed(2)
+        }
       }
+
     },
     info: {
       immediate: true,