Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -184,91 +184,91 @@ export const asyncRoutes = [
     children: [
       {
         path: 'tdsyq',
-        component: () => import('@/views/business-info/tdsyq/index'),
+        component: () => import('@/views/bdcsj/tdsyq/index'),
         name: 'tdsyq',
         meta: { title: '土地所有权' }
       },
       {
         path: 'jsydzjdsyq',
-        component: () => import('@/views/business-info/jsydzjdsyq/index'),
+        component: () => import('@/views/bdcsj/jsydzjdsyq/index'),
         name: 'jsydzjdsyq',
         meta: { title: '建设用地、宅基地使用权' }
       },
       {
         path: 'fdcqdz',
-        component: () => import('@/views/business-info/fdcqdz/index'),
+        component: () => import('@/views/bdcsj/fdcqdz/index'),
         name: 'fdcqdz',
         meta: { title: '房地产权（项目内多幢房屋）' }
       },
       {
         path: 'fdcqyz',
-        component: () => import('@/views/business-info/fdcqyz/index'),
+        component: () => import('@/views/bdcsj/fdcqyz/index'),
         name: 'fdcqyz',
         meta: { title: '房地产权（独幢、层、套、间、房屋）' }
       },
       {
         path: 'fdcqqfsyq',
-        component: () => import('@/views/business-info/fdcqqfsyq/index'),
+        component: () => import('@/views/bdcsj/fdcqqfsyq/index'),
         name: 'fdcqqfsyq',
         meta: { title: '建筑物区分所有权业主共有部分' }
       },
       {
         path: 'hysyq',
-        component: () => import('@/views/business-info/hysyq/index'),
+        component: () => import('@/views/bdcsj/hysyq/index'),
         name: 'hysyq',
         meta: { title: '海域(含无居民海岛)使用权' }
       },
       {
         path: 'gzwsyq',
-        component: () => import('@/views/business-info/gzwsyq/index'),
+        component: () => import('@/views/bdcsj/gzwsyq/index'),
         name: 'gzwsyq',
         meta: { title: '构（建）筑物所有权' }
       },
       {
         path: 'nydsyq',
-        component: () => import('@/views/business-info/nydsyq/index'),
+        component: () => import('@/views/bdcsj/nydsyq/index'),
         name: 'nydsyq',
         meta: { title: '农用地使用权（非林地）' }
       },
       {
         path: 'lq',
-        component: () => import('@/views/business-info/lq/index'),
+        component: () => import('@/views/bdcsj/lq/index'),
         name: 'lq',
         meta: { title: '林权' }
       },
       {
         path: 'zxdj',
-        component: () => import('@/views/business-info/zxdj/index'),
+        component: () => import('@/views/bdcsj/zxdj/index'),
         name: 'zxdj',
         meta: { title: '注销登记' }
       },
       {
         path: 'yydj',
-        component: () => import('@/views/business-info/yydj/index'),
+        component: () => import('@/views/bdcsj/yydj/index'),
         name: 'yydj',
         meta: { title: '异议登记' }
       },
       {
         path: 'ygdj',
-        component: () => import('@/views/business-info/ygdj/index'),
+        component: () => import('@/views/bdcsj/ygdj/index'),
         name: 'ygdj',
         meta: { title: '预告登记' }
       },
       {
         path: 'Cfdj',
-        component: () => import('@/views/business-info/Cfdj/index'),
+        component: () => import('@/views/bdcsj/cfdj/index'),
         name: 'Cfdj',
         meta: { title: '查封登记' }
       },
       {
         path: 'dyaq',
-        component: () => import('@/views/business-info/dyaq/index'),
+        component: () => import('@/views/bdcsj/dyaq/index'),
         name: 'dyaq',
         meta: { title: '抵押权登记' }
       },
       {
         path: 'dyiq',
-        component: () => import('@/views/business-info/dyiq/index'),
+        component: () => import('@/views/bdcsj/dyiq/index'),
         name: 'dyiq',
         meta: { title: '地役权登记' }
       }

@@ -287,15 +287,20 @@ table td {
   background-size: 100% 100%;
   padding-top: 13px;
   padding-bottom: 13px;
-  table{
+  border: none;
+  margin-top: 5px !important;
+
+  table {
     background: url("~@/image/rqjx.png") no-repeat;
     background-size: 100% 100%;
     padding: 8px;
   }
+
   table td {
     box-sizing: border-box;
-    border-bottom: 0px solid #074487!important;
+    border-bottom: 0px solid #074487 !important;
   }
+
   .el-input__inner {
     background-color: #031a46;
   }
@@ -312,9 +317,11 @@ table td {
   .el-date-table td.disabled div {
     background-color: #074487;
   }
-  .el-date-picker__header{
+
+  .el-date-picker__header {
     margin-bottom: 0px;
   }
+
   .el-date-picker__header-label {
     color: #A6CFD6;
   }
@@ -322,12 +329,13 @@ table td {
   .el-picker-panel__content {
     padding-top: 0px;
     margin-top: 0px;
+
     .disabled {
       background-color: #074487;
-      div{
-        span{
-          color:rgba(172, 239, 250,.5)
 
+      div {
+        span {
+          color: rgba(172, 239, 250, .5)
         }
       }
 
@@ -435,7 +443,7 @@ table td {
 
   [class^="el-icon-"],
   [class*=" el-icon-"] {
-    display: none;
+    // display: none;
   }
 
   .el-range-separator {
@@ -476,4 +484,4 @@ table td {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: transparent !important;
-}
+}
\ No newline at end of file

@@ -18,20 +18,22 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="汇交时间" prop="exchangeStartTime">
-              <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
-                clearable v-model="form.exchangeStartTime" value-format="yyyy-MM-dd"></el-date-picker>
+              <el-date-picker type="date" class="width100" placeholder="开始日期" clearable
+                :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
+                value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
-              <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                clearable v-model="form.exchangeEndTime" value-format="yyyy-MM-dd"></el-date-picker>
+              <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
+                :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
+                value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="汇交状态" prop="state">
               <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态">
-                 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>