新增组件及页面

dgtis-ui/src/assets/styles/index.scss

@@ -293,5 +293,16 @@ aside {
       width: 100%;
     }
   }
+  .formItemFull2{
+    .el-input--mini {
+      width: 90%;
+    }
+    &:nth-child(n+2){
+      margin-top: 5px;
+    }
+    .el-select{
+      width: 100%;
+    }
+  }
 }
 

dgtis-ui/src/layout/components/Navbar.vue

@@ -93,13 +93,15 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
+          this.$router.push({ path:'/login'  })
+        })
         this.$store.dispatch('LogOut').then(() => {
           // location.href = '/index';
           this.$router.push({ path:'/login'  })
-          this.$store.dispatch('tagsView/delAllViews')
         })
       })
-    }
+    },
   }
 }
 </script>

dgtis-ui/src/views/system/userInfo/components/contractInformation.vue

@@ -34,10 +34,10 @@
         </el-col>
         <el-col :span="12">
           <span class="name">续保日期</span>
-          <span class="value">{{parseTime(item.renewaldate,'{yy}-{mm}-{dd}')}}</span>
+          <span class="value" v-if="item.norenewal != item.payendyear">{{parseTime(item.renewaldate,'{yy}-{mm}-{dd}')}}</span>
         </el-col>
         <el-col :span="12">
-          <span class="name">续保次数</span>
+          <span class="name">已缴期数</span>
           <span class="value">{{item.norenewal}}次</span>
         </el-col>
         <el-col :span="12">
@@ -72,7 +72,7 @@
         </el-col>
         <el-col :span="12">
           <span class="name">下次缴费日期</span>
-          <span class="value" v-if="item.payment != '趸缴'">{{parseTime(item.npdate,'{yy}-{mm}-{dd}')}}</span>
+          <span class="value" v-if="item.payment != '趸缴' || item.norenewal != item.payendyear ">{{parseTime(item.npdate,'{yy}-{mm}-{dd}')}}</span>
         </el-col>
         <el-col :span="12">
           <span class="name">被保人数</span>