kun 19/10/14 17:10

src/views/project/Application.vue

@@ -374,6 +374,7 @@ import HeaderNav from "../../components/HeaderNav";
 /* eslint-disable */
 import FooterNav from "../../components/FooterNav";
 import RichTextFour from "../../components/RichTextFour";
+import RegisteredVue from '../Registered.vue';
 const T_T = new Date()
 export default {
   components: {
@@ -444,7 +445,8 @@ export default {
       proimages: '',
       file: '',
       subStatus: 0,
-      src: ''
+      src: '',
+      pictureHeight: ''
     };
   },
   computed: {},
@@ -460,6 +462,8 @@ export default {
     },
     /** 下一步 */
     btn(index) {
+      let regd = /(\d3,4|\d{3,4}-|\s)?\d{8}/
+      let regs = /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/
       let s = this.sub;
       s = index;
 
@@ -469,6 +473,17 @@ export default {
 
       // this.sub = s
 
+      let aterm = new Date(this.aterm).getTime()
+      let fterm = new Date(this.fterm).getTime()
+
+      // if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
+      //   alert('请填写正确的手机号码！')
+      //   return
+      // }else{
+      //   alert('yes')
+      // }
+
+
       if (s == 1) {
         if (this.name == '' || this.company == '' || this.tid == '' ||
           this.rid == '' || this.first_level == '' || this.secondary == '' ||
@@ -481,6 +496,15 @@ export default {
         ) {
           alert('以上内容不可为空！')
           return
+        } else if (this.aterm > this.fterm) {
+          alert('截止日期应比申请日期晚')
+          return
+        } else if (!regd.test(this.poffice_tel) || !regd.test(this.coffice_tel)) {
+          alert('请填写正确的电话号码！')
+          return
+        } if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
+          alert('请填写正确的手机号码！')
+          return
         } else {
           this.sub = s
         }
@@ -490,13 +514,13 @@ export default {
     getFile(event) {
       let _this = this
       let file = event.target.files[0];
-/*
-      let reader = new FileReader()
-      reader.readAsDataURL(file) // 这里是最关键的一步，转换就在这里
-      reader.onloadend = function () {
-        _this.src = this.result
-      }
-*/
+      /*
+            let reader = new FileReader()
+            reader.readAsDataURL(file) // 这里是最关键的一步，转换就在这里
+            reader.onloadend = function () {
+              _this.src = this.result
+            }
+      */
 
       let param = new FormData(); //创建form对象
       param.append('file', file);//通过append向form对象添加数据
@@ -509,7 +533,6 @@ export default {
           let url = response.data.data.url
           this.file = url
         })
-      console.log(this.file)
     },
     /** 保存和提交 */
     submit(index) {
@@ -604,6 +627,9 @@ export default {
         if (res.data.code === 200) {
           alert(res.data.data.msg)
           _this.proimages = ''
+          _this.$router.push({
+            name: 'project'
+          })
         } else {
           alert(res.data.message)
         }
@@ -680,11 +706,11 @@ export default {
 .img-img {
   margin-top: 25px;
   width: 150px;
-  height: 250px;
+  height: auto;
 
   &::-webkit-scrollbar {
     width: 0px;
-    height: 00x;
+    height: 0px;
   }
 }
 
@@ -903,6 +929,7 @@ export default {
               text-align: right;
               letter-spacing: 0px;
               color: #323232;
+              white-space: nowrap;
             }
 
             .i-i {
@@ -911,7 +938,7 @@ export default {
               background-color: #ffffff;
               border: solid 1px #c7c7c7;
               outline: none;
-              margin-left: 30px;
+              margin-left: 20px;
               font-family: "MicrosoftYaHei";
               font-size: 18px;
               font-weight: normal;
@@ -945,7 +972,7 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        margin-bottom: 25px;
+        margin-bottom: 30px;
 
         label {
           display: inline-block;
@@ -959,6 +986,7 @@ export default {
           text-align: right;
           letter-spacing: 0px;
           color: #323232;
+          white-space: nowrap;
         }
 
         select {
@@ -976,7 +1004,7 @@ export default {
           padding-left: 83px;
           box-sizing: border-box;
           outline: none;
-          margin-left: 30px;
+          margin-left: 20px;
           font-family: "MicrosoftYaHei";
           font-size: 18px;
           font-weight: normal;
@@ -992,7 +1020,7 @@ export default {
           background-color: #ffffff;
           border: solid 1px #c7c7c7;
           outline: none;
-          margin-left: 30px;
+          margin-left: 20px;
           font-family: "MicrosoftYaHei";
           font-size: 18px;
           font-weight: normal;
@@ -1007,7 +1035,7 @@ export default {
           background-color: #ffffff;
           border: solid 1px #c7c7c7;
           outline: none;
-          margin-left: 30px;
+          margin-left: 20px;
           font-family: "MicrosoftYaHei";
           font-size: 18px;
           font-weight: normal;

src/views/project/Project.vue

@@ -404,9 +404,15 @@ export default {
               height: 97px;
               margin-top: 25px;
               position: relative;
+              display: flex;
+              flex-direction: column;
+              justify-content: space-between;
 
               dd {
-                margin-bottom: 22px;
+                height: 20px;
+                display: flex;
+                align-items: center;
+
                 .iconfont {
                   font-size: 17px;
                   color: #ccc;
@@ -423,10 +429,10 @@ export default {
 
                 .block-k {
                   width: 288px;
-                  height: 14px;
-                  line-height: 14px;
                   display: inline-block;
-                  overflow: hidden;
+                 /* overflow: hidden;*/
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
 
                   b {
                     font-weight: 900;