Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -314,7 +314,7 @@
         methods: {
         methods: {
 
 
             inputBlur(e){
             inputBlur(e){
-                if(e.target.value!==''&&e.target.value>0&&e.target.value<10){
+                if(e.target.value!==''&&+e.target.value>0&&+e.target.value<10){
                     e.target.style.border=""
                     e.target.style.border=""
                 }else{
                 }else{
                     e.target.style.border="1px solid red";
                     e.target.style.border="1px solid red";
@@ -424,12 +424,12 @@
                         data:this.form.ftxs,
                         data:this.form.ftxs,
                         name:'分摊系数',
                         name:'分摊系数',
                         dom:this.$refs.ftxs,
                         dom:this.$refs.ftxs,
-                        rule: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/, //非空
+                        rule:/^(?!0(\.0{1,2})?$)(\d(\.\d{1,2})?)$/, //大于0小于10的所有保留两位的数字
                     },
                     },
                 ];
                 ];
                 let flag = true;
                 let flag = true;
                 this.rules.forEach(item=>{
                 this.rules.forEach(item=>{
-                    if(item.rule.test(item.data) || item.data == null){
+                    if(!item.rule.test(+item.data) || item.data == null){
                         if(item.dom.$el){
                         if(item.dom.$el){
                             item.dom.$el.style.border = '1px solid red';
                             item.dom.$el.style.border = '1px solid red';
                             item.dom.$el.style.boxSizing = 'border-box';
                             item.dom.$el.style.boxSizing = 'border-box';
@@ -444,6 +444,8 @@
 
 
                 this.form['hbsms'] = this.bsms
                 this.form['hbsms'] = this.bsms
                 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
                 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
+                this.$nextTick(()=> {
+                    if (flag) {
                         for(let i=0;i< this.form.fwjgList.length;i++){
                         for(let i=0;i< this.form.fwjgList.length;i++){
                             if(this.form.fwjgList[i].fwjgzdbsm===''){
                             if(this.form.fwjgList[i].fwjgzdbsm===''){
                                 this.form.fwjgList.splice(i,1);
                                 this.form.fwjgList.splice(i,1);
@@ -471,6 +473,14 @@
                                 this.close();
                                 this.close();
                             }
                             }
                         })
                         })
+                    }else{
+                        this.$message({
+                            // message: item.name+'不能为空',
+                            message: '表单数据有误',
+                            type: "warning",
+                        });
+                    }
+                })
             },
             },
             cancel: function () {
             cancel: function () {
                this.close()
                this.close()

@@ -79,7 +79,7 @@
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.bdcdyh}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.xmmc}}</td>
                             <td>{{item.bdcqzh}}</td>
                             <td>{{item.bdcqzh}}</td>
-                            <td>{{item.qlr}}</td>
+                            <td>{{item.qlrmc}}</td>
                             <td>{{item.zl}}</td>
                             <td>{{item.zl}}</td>
                         </tr>
                         </tr>
                     </table>
                     </table>