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

+ 24 - 1
src/assets/styles/index.scss

@@ -874,5 +874,28 @@ $border: #ddd;
     border-bottom: 1px solid #AAAAAA!important;
 }
 .el-table thead tr th{
-    border-color: #AAAAAA;
+    border-color: none !important;
+}
+.table_register {
+  /**
+  改变边框颜色
+   */
+  .el-table--border, .el-table--group {
+    border: none!important;
+  }
+  /**
+  改变表格内竖线颜色
+   */
+  .el-table--border  td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+    border-right: none!important;
+  }
+  /**
+  改变表格内行线颜色
+   */
+  .el-table td, .el-table th.is-leaf  {
+      border-bottom: none!important;
+  }
+  .el-table thead tr th{
+      border-color: none !important;
+  }
 }

+ 2 - 2
src/utils/validate.js

@@ -102,11 +102,11 @@ export function validIDcard(rule, value, cb) {
  * @param {*} s
  */
 export function isAmount(s) {
-  return /^\d{1,12}(\.\d{1,2})?$/.test(s)
+  return /^\d{1,12}(\.\d{1,6})?$/.test(s)
 }
 export function validAmount(rule, value, cb) {
   if (!isAmount(value)) {
-    cb(new Error('仅可以输入数字和小数点,保留小数点后位'))
+    cb(new Error('仅可以输入数字和小数点,保留小数点后位'))
   } else {
     cb()
   }

+ 9 - 6
src/views/common/registerFirst.vue

@@ -576,12 +576,15 @@ export default {
       })
     },
     validLicense(val) {
-      validLicenseApi(val).then(res => {
-        // true存在
-        if(res.data) {
-          this.$message.error('统一社会信用代码已经存在,不可以重复注册');
-        }
-      })
+      if(val) {
+        validLicenseApi(val).then(res => {
+          // true存在
+          if(res.data) {
+            this.$message.error('统一社会信用代码已经存在,不可以重复注册');
+          }
+        })
+      }
+      
     },
     getEnclosureData() {
       getEnclosureApi(this.token,this.attachType, this.dataId).then(res => {

+ 7 - 5
src/views/enterprise/ent/edit.vue

@@ -597,11 +597,13 @@ export default {
   },
   methods: {
     validLicense(val) {
-      validLicenseApi(val).then(res => {
-        if(res.data) {
-          this.$message.error('统一社会信用代码已经存在,不可以重复注册');
-        }
-      })
+      if(val) {
+        validLicenseApi(val).then(res => {
+          if(res.data) {
+            this.$message.error('统一社会信用代码已经存在,不可以重复注册');
+          }
+        })
+      }
     },
     async getEnclosureData() {
       getEnclosureApi(this.attachType, this.dataId).then(res => {

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

@@ -70,7 +70,7 @@
         </tr>
         <tr v-if="!disabledVisible">
           <td colspan="4">
-            <el-table :data="form.headAddVOList" border>
+            <el-table :data="form.headAddVOList" class="table-con">
               <el-table-column label="姓名" prop="name" align="center" width="120">
                 <template slot-scope="scope">
                   <el-form-item label-width="0" :prop="'headAddVOList.'+scope.$index+'.name'">
@@ -78,7 +78,7 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="性别" prop="sex" align="center" width="120">
+              <el-table-column label="性别" prop="sex" align="center">
                 <template slot-scope="scope">
                   <el-form-item label-width="0" :prop="'headAddVOList.'+scope.$index+'.sex'">
                     <!-- <el-input v-model="scope.row.sex"></el-input> -->
@@ -161,7 +161,7 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" align="center" width="150">
+              <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                   <el-button v-if="!scope.row.disabled" type="text" class="danger" @click="delProcess(scope.$index)">移除
                   </el-button>
@@ -172,7 +172,7 @@
         </tr>
         <tr v-if="disabledVisible">
           <td colspan="4">
-            <el-table :data="form.headAddVOList" border>
+            <el-table :data="form.headAddVOList" class="table-con">
               <el-table-column label="姓名" prop="name" align="center" width="120">
               </el-table-column>
               <el-table-column label="性别" prop="sex" align="center" width="80">
@@ -187,13 +187,13 @@
               </el-table-column>
               <el-table-column label="现从事专业" prop="currentMajor" align="center" width="150">
               </el-table-column>
-              <el-table-column label="职称" prop="jobTitle" align="center" width="150">
+              <el-table-column label="职称" prop="jobTitle" align="center">
               </el-table-column>
               <el-table-column label="部门" prop="dept" align="center" width="150">
               </el-table-column>
-              <el-table-column label="在本项目中承担工作" prop="responsibilities" align="center" width="150">
+              <el-table-column label="在本项目中承担工作" prop="responsibilities" align="center">
               </el-table-column>
-              <el-table-column label="联系电话" prop="contactNumber" align="center" width="150">
+              <el-table-column label="联系电话" prop="contactNumber" align="center">
               </el-table-column>
             </el-table>
           </td>