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

@@ -60,28 +60,8 @@ class business {
       data
     })
   }
-
-
-
-
-  // 抵押权登记
-  async getQlfQlDyaqByCondition (data) {
-    return request({
-      url: SERVER.SERVERAPI +'/rest/reg/QlfQlDyaq/getDataPage',
-      method: 'post',
-      data
-    })
-  }
-  // 查封登记信息
-  async getQlfQlCfdjByCondtion (data) {
-    return request({
-      url: SERVER.SERVERAPI +'/rest/reg/QlfQlCfdj/getDataPage',
-      method: 'post',
-      data
-    })
-  }
   // 构（建）筑物所有权
-  async getQltQlGjzwsyqByCondition (data) {
+  async getQltQlGjzwsyqList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QltQlGjzwsyq/getDataPage',
       method: 'post',
@@ -97,7 +77,7 @@ class business {
     })
   }
   // 林权
-  async getQltQlLqByCondition (data) {
+  async getQltQlLqList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QltQlLq/getDataPage',
       method: 'post',
@@ -105,7 +85,7 @@ class business {
     })
   }
   // 注销登记
-  async getQlfQlZxdjByCondition (data) {
+  async getQlfQlZxdjList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlZxdj/getDataPage',
       method: 'post',
@@ -113,7 +93,7 @@ class business {
     })
   }
   // 异议登记信息
-  async getQlfQlYydjByCondition (data) {
+  async getQlfQlYydjList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlYydj/getDataPage',
       method: 'post',
@@ -121,15 +101,35 @@ class business {
     })
   }
   // 预告登记信息
-  async getQlfQlYgdjByCondition (data) {
+  async getQlfQlYgdjList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlYgdj/getDataPage',
       method: 'post',
       data
     })
   }
+  // 查封登记信息
+  async getQlfQlCfdjList (data) {
+    return request({
+      url: SERVER.SERVERAPI +'/rest/reg/QlfQlCfdj/getDataPage',
+      method: 'post',
+      data
+    })
+  }
+
+
+
+  // 抵押权登记
+  async getQlfQlDyaqList (data) {
+    return request({
+      url: SERVER.SERVERAPI +'/rest/reg/QlfQlDyaq/getDataPage',
+      method: 'post',
+      data
+    })
+  }
+
   // 地役权
-  async getQlfQlDyiqByCondtion (data) {
+  async getQlfQlDyiqList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlDyiq/getDataPage',
       method: 'post',

 <template>
   <div class="navbar-con">
     <div class="navbar">
-      <div class="title">{{ title }}</div>
+      <div class="title">{{ dicData['sysCode'][0].DNAME }}</div>
       <div class="user">欢迎进入系统 {{ name }} <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />退出系统</div>
       <div class="sidebarLeft">
         <sidebarLeft />
@@ -13,7 +13,6 @@
   </div>
 </template>
 <script>
-import defaultSettings from '@/settings'
 import sidebarLeft from './Sidebar/sidebarLeft'
 import sidebarRight from './Sidebar/sidebarRight'
 import { mapGetters } from 'vuex'
@@ -23,16 +22,10 @@ export default {
     sidebarRight
   },
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'name'])
-  },
-  data () {
-    return {
-      title: defaultSettings.title
-    }
+    ...mapGetters(['sidebar', 'dicData', 'name'])
   },
   methods: {
     onCancel () {
-
     }
   }
 }

@@ -215,60 +215,60 @@ export const asyncRoutes = [
         path: 'seaArea',
         component: () => import('@/views/business-info/sea-area/index'),
         name: 'seaArea',
-        meta: { title: ' 海域(含无居民海岛)使用权' }
+        meta: { title: '海域(含无居民海岛)使用权' }
       },
       {
-        path: 'buildingOwnership',
-        component: () => import('@/views/business-info/building-ownership/index'),
-        name: 'buildingOwnership',
-        meta: { title: ' 构（建）筑物所有权' }
+        path: 'gzwsyq',
+        component: () => import('@/views/business-info/gzwsyq/index'),
+        name: 'gzwsyq',
+        meta: { title: '构（建）筑物所有权' }
       },
       {
-        path: 'agriculturalLand',
-        component: () => import('@/views/business-info/agricultural-land/index'),
-        name: 'agriculturalLand',
-        meta: { title: ' 农用地使用权（非林地）' }
+        path: 'nydsyq',
+        component: () => import('@/views/business-info/nydsyq/index'),
+        name: 'nydsyq',
+        meta: { title: '农用地使用权（非林地）' }
       },
       {
-        path: 'forestOwnership',
-        component: () => import('@/views/business-info/forest-ownership/index'),
-        name: 'forestOwnership',
-        meta: { title: ' 林权' }
+        path: 'lq',
+        component: () => import('@/views/business-info/lq/index'),
+        name: 'lq',
+        meta: { title: '林权' }
       },
       {
-        path: 'cancellationReg',
-        component: () => import('@/views/business-info/cancellation-registration/index'),
-        name: 'cancellationReg',
-        meta: { title: ' 注销登记' }
+        path: 'zxdj',
+        component: () => import('@/views/business-info/zxdj/index'),
+        name: 'zxdj',
+        meta: { title: '注销登记' }
       },
       {
-        path: 'objectionReg',
-        component: () => import('@/views/business-info/objection-registration/index'),
-        name: 'objectionReg',
-        meta: { title: ' 异议登记' }
+        path: 'yydj',
+        component: () => import('@/views/business-info/yydj/index'),
+        name: 'yydj',
+        meta: { title: '异议登记' }
       },
       {
-        path: 'noticeReg',
-        component: () => import('@/views/business-info/notice-registration/index'),
-        name: 'noticeReg',
-        meta: { title: ' 预告登记' }
+        path: 'ygdj',
+        component: () => import('@/views/business-info/ygdj/index'),
+        name: 'ygdj',
+        meta: { title: '预告登记' }
       },
       {
-        path: 'seizureReg',
-        component: () => import('@/views/business-info/seizure-registration/index'),
-        name: 'seizureReg',
-        meta: { title: ' 查封登记' }
+        path: 'Cfdj',
+        component: () => import('@/views/business-info/Cfdj/index'),
+        name: 'Cfdj',
+        meta: { title: '查封登记' }
       },
       {
-        path: 'mortgageReg',
-        component: () => import('@/views/business-info/mortgage-registration/index'),
-        name: 'mortgageReg',
+        path: 'dyaq',
+        component: () => import('@/views/business-info/dyaq/index'),
+        name: 'dyaq',
         meta: { title: ' 抵押权登记' }
       },
       {
-        path: 'easementReg',
-        component: () => import('@/views/business-info/easement-registration/index'),
-        name: 'easementReg',
+        path: 'dyiq',
+        component: () => import('@/views/business-info/dyiq/index'),
+        name: 'dyiq',
         meta: { title: ' 地役权登记' }
       }
     ]

@@ -183,7 +183,6 @@ table th {
 table td {
   box-sizing: border-box;
   border-bottom: none !important;
-  ;
 }
 
 //去掉最下面的那一条线
@@ -197,8 +196,8 @@ table td {
 }
 
 .el-table__body tr:hover {
-  background: rgba(2, 160, 253, 0.3) !important;
-  box-shadow: inset 0px 0px 18px 0px #02A0FD !important;
+  background: #063160 !important;
+  box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
 }
 
 .el-table__body tr:hover>td {

@@ -106,11 +106,8 @@ html {
   padding: 0px !important;
 }
 
-.padding-content {
-  padding: 4px 0;
-}
-
 a:focus,
+div:focus,
 a:active {
   outline: none;
 }
@@ -127,20 +124,20 @@ ul li {
   list-style: none;
 }
 
-div:focus {
-  outline: none;
-}
-
 .fr {
   float: right;
 }
 
-.mt15 {
+.fl {
+  float: left;
+}
+
+.mt-15 {
   margin-top: 15px;
 }
 
-.fl {
-  float: left;
+.mb-5 {
+  margin-bottom: 5px;
 }
 
 .pr-5 {
@@ -155,7 +152,7 @@ div:focus {
   margin-top: 10px;
 }
 
-//flex
+//flex 公共样式
 .d-flex {
   display: flex;
 }
@@ -171,9 +168,6 @@ div:focus {
   justify-content: center;
 }
 
-.bg-color-blue {
-  background-color: #1a5cd7;
-}
 
 .jc-between {
   justify-content: space-between;
@@ -192,13 +186,6 @@ div:focus {
   font-size: 24px;
 }
 
-.inlineBlock {
-  display: block;
-}
-
-.marginbtm5 {
-  margin-bottom: 5px !important;
-}
 
 .clearfix {
   &:after {
@@ -235,23 +222,6 @@ aside {
 }
 
 //main-container全局样式
-.app-container {
-  padding: 20px;
-}
-
-.components-container {
-  margin: 30px 50px;
-  position: relative;
-}
-
-.pagination-container {
-  margin-top: 30px;
-}
-
-.text-center {
-  text-align: center
-}
-
 .width100 {
   width: 100% !important;
 }
@@ -366,14 +336,15 @@ aside {
   color: $yellow;
 }
 
-// 通过 入库
-.adopt {
+// 通过 入库 样式
+.adopt,
+.success {
   color: #00FAA8;
   position: relative;
 }
 
 .warehousing {
-  color: #FF9933;
+  color: #FFCA57;
   position: relative;
 }
 
@@ -382,39 +353,54 @@ aside {
   position: absolute;
   content: '';
   display: block;
-  width: 10px;
-  height: 10px;
+  width: 8px;
+  height: 8px;
   left: -15px;
-  top: 3px;
+  top: 5px;
   background: #00FAA8;
   border-radius: 50%;
-  border: 2px solid rgba(0, 0, 0, 0.6);
+  border: 2px solid rgba(0, 0, 0, 0.2);
 }
 
 .warehousing::before {
   position: absolute;
   content: '';
   display: block;
-  width: 10px;
-  height: 10px;
+  width: 8px;
+  height: 8px;
   left: -15px;
-  top: 3px;
+  top: 4px;
   background: #FF9933;
   border-radius: 50%;
-  border: 2px solid rgba(0, 0, 0, 0.6);
+  border: 2px solid rgba(0, 0, 0, 0.2);
 }
 
-//错误日志样式 后期超优化
-.item-cwnr {
-  white-space: pre-wrap;
-  display: -webkit-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  overflow-wrap: break-word;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
+// 成功 失败
+.success::before {
+  position: absolute;
+  content: '√';
+  display: block;
+  width: 0;
+  height: 8px;
+  left: -10px;
+  top: 1px;
+  background: #00FAA8;
+  color: #00FAA8;
+}
+
+.fail {
+  color: #FF7962;
+  position: relative;
 }
 
-.item-cwnr img {
-  height: 30px;
+.fail::before {
+  position: absolute;
+  content: '!';
+  display: block;
+  width: 0;
+  height: 8px;
+  left: -10px;
+  top: 1px;
+  background: #FF7962;
+  color: #FF7962;
 }
\ No newline at end of file

@@ -10,7 +10,7 @@
         }
 
         .el-table__row .cell {
-            color: #ACEFFA !important;
+            color: #DBFAFF !important;
         }
 
         .el-table__row {

@@ -7,29 +7,29 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       {
         label: "不动产单元号",
-        prop: "BDCDYH"
+        prop: "bdcdyh"
       },
       {
         label: "查封文号",
-        prop: "CFWH",
+        prop: "cfwh",
         width: 150
       },
       {
         label: "查封机关",
-        prop: "CFJG"
+        prop: "cfjg"
       },
       {
         label: "查封开始时间",
-        prop: "CFQSSJ"
+        prop: "cfqssj"
       },
       {
         label: "查封结束时间",
-        prop: "CFJSSJ"
+        prop: "cfjssj"
       },
       {
         label: "查封类型",
@@ -45,7 +45,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       }
     ]
   }

 <template>
-  <div class="seizureReg from-clues">
+  <div class="Cfdj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -55,7 +55,7 @@ import dataReporting from '@/api/dataReporting'
 import tableMixin from '@/mixins/tableMixin.js'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "seizureReg",
+  name: "Cfdj",
   mixins: [tableMixin],
   components: {
     editDialog
@@ -124,7 +124,7 @@ export default {
     async featchData () {
       try {
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlCfdjByCondtion(this.form)
+        } = await business.getQlfQlCfdjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

 <template>
-  <div class="mortgageReg from-clues">
+  <div class="dyaq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -51,7 +51,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "mortgageReg",
+  name: "dyaq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -122,7 +122,7 @@ export default {
       try {
         this.loading = true
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlDyaqByCondition(this.form)
+        } = await business.getQlfQlDyaqList(this.form)
         this.tableData.data = list;
         this.pageData = {
           pageSize,

 <template>
-  <div class="easementReg from-clues">
+  <div class="dyiq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -47,7 +47,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "easementReg",
+  name: "dyiq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -113,7 +113,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlDyiqByCondtion(this.form)
+        } = await business.getQlfQlDyiqList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -7,7 +7,7 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       // {
@@ -42,7 +42,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号3">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

@@ -7,7 +7,7 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       // {
@@ -35,7 +35,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号5">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

@@ -7,7 +7,7 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       // {
@@ -42,11 +42,11 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",
-        prop: "DJJG"
+        prop: "djjg"
       }
     ]
   }

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号4">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

@@ -134,7 +134,7 @@ export default {
         this.loading = true
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQltQlGjzwsyqByCondition(this.form)
+        } = await business.getQltQlGjzwsyqList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号2">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

 <template>
-  <div class="forestOwnership from-clues">
+  <div class="lq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -42,7 +42,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "forestOwnership",
+  name: "lq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -107,7 +107,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQltQlLqByCondition(this.form)
+        } = await business.getQltQlLqList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -42,7 +42,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号1">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

 <template>
-  <div class="noticeReg from-clues">
+  <div class="ygdj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "noticeReg",
+  name: "ygdj",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -147,9 +147,8 @@ export default {
     },
     async featchData () {
       try {
-        this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlYgdjByCondition(this.form)
+        } = await business.getQlfQlYgdjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -7,29 +7,29 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       {
         label: "不动产单元号",
-        prop: "BDCDYH"
+        prop: "bdcdyh"
       },
       {
         label: "异议事项",
-        prop: "YYSX"
+        prop: "yysx"
       },
       {
         label: "不动产登记证明号",
-        prop: "BDCDJZMH"
+        prop: "bdcdjzmh"
       },
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",
-        prop: "DJJG"
+        prop: "djjg"
       }
     ]
   }

 <template>
-  <div class="objectionReg from-clues">
+  <div class="yydj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "objectionReg",
+  name: "yydj",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -132,7 +132,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlYydjByCondition(this.form)
+        } = await business.getQlfQlYydjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -105,7 +105,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlZxdjByCondition(this.form)
+        } = await business.getQlfQlZxdjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -4,7 +4,7 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">

@@ -21,7 +21,7 @@
         </div>
       </div>
     </div>
-    <div class="card mt15">
+    <div class="card mt-15">
       <div class="cardhead">省厅汇交</div>
       <div class="cardcontent">
         <ul class="cardcontent-left d-center">
@@ -42,7 +42,7 @@
         </div>
       </div>
     </div>
-    <div class="card1 mt15">
+    <div class="card1 mt-15">
       <div class="cardhead">各区县数据上报统计</div>
       <columnar />
     </div>

@@ -3,9 +3,41 @@ class data extends filter {
   constructor() {
     super()
   }
-  columns() {
+  columns () {
     return [
       {
+        prop: 'jcjg',
+        label: '检查结果',
+        width: 100,
+        render: (h, scope) => {
+          return (
+            <div>
+              {
+                scope.row.receiveState
+                  ? <span class='adopt'>通过</span>
+                  : <span class='warehousing'>不通过</span>
+              }
+            </div>
+          )
+        }
+      },
+      {
+        prop: 'rkjg',
+        label: '入库结果',
+        width: 100,
+        render: (h, scope) => {
+          return (
+            <div>
+              {
+                scope.row.storageState
+                  ? <span class='success'>成功</span>
+                  : <span class='fail'>失败</span>
+              }
+            </div>
+          )
+        }
+      },
+      {
         prop: "areacode",
         label: "行政区代码",
         width: 100,
@@ -43,39 +75,7 @@ class data extends filter {
       {
         prop: "createdate",
         label: "接收时间",
-      },
-      {
-        prop: 'jcjg',
-        label: '检查结果',
-        width: 100,
-        render: (h, scope) => {
-          return (
-            <div>
-              {
-                scope.row.receiveState
-                  ? <span class='adopt'>通过</span>
-                  : <span>通过1</span>
       }
-            </div>
-          )
-        }
-      },
-      {
-        prop: 'rkjg',
-        label: '入库结果',
-        width: 100,
-        render: (h, scope) => {
-          return (
-            <div>
-              {
-                scope.row.storageState
-                  ? <span class='warehousing'>入库</span>
-                  : <span>入库1</span>
-              }
-            </div>
-          )
-        }
-      },
     ]
   }
 }

@@ -4,7 +4,7 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">

@@ -4,7 +4,7 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="55px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">

@@ -4,7 +4,7 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-row class="marginbtm5">
+        <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">