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

@@ -4,6 +4,7 @@ import dataDetails from "@/components/dataDetails/edit-dialog";
 let mixin = {
   data () {
     return {
+      title: '',
       formData: {
         pageSize: 10
       }

@@ -264,13 +264,13 @@ export const asyncRoutes = [
         path: 'dyaq',
         component: () => import('@/views/business-info/dyaq/index'),
         name: 'dyaq',
-        meta: { title: ' 抵押权登记' }
+        meta: { title: '抵押权登记' }
       },
       {
         path: 'dyiq',
         component: () => import('@/views/business-info/dyiq/index'),
         name: 'dyiq',
-        meta: { title: ' 地役权登记' }
+        meta: { title: '地役权登记' }
       }
     ]
   },

@@ -263,19 +263,24 @@ table td {
 .el-popper[x-placement^="bottom"] .popper__arrow {
   display: none;
 }
+
 // 时间选择框样式
-.el-date-picker{
-  .el-date-table td.disabled div{
-    background-color:#074487;
+.el-date-picker {
+  .el-date-table td.disabled div {
+    background-color: #074487;
   }
+
   background-color: #031a46;
-  .el-date-picker__header-label{
-  color:#A6CFD6;
+
+  .el-date-picker__header-label {
+    color: #A6CFD6;
   }
-  .el-picker-panel__content{
-    background-color:#074487;
-    .disabled{
-      background-color:#074487;
+
+  .el-picker-panel__content {
+    background-color: #074487;
+
+    .disabled {
+      background-color: #074487;
 
     }
   }
@@ -303,85 +308,94 @@ table td {
 }
 
 // 时间选择框2
-
-
-.el-date-range-picker{
-  .el-date-range-picker__time-header > .el-icon-arrow-right{
-    color:#E3F1FF;;
+.el-date-range-picker {
+  .el-date-range-picker__time-header>.el-icon-arrow-right {
+    color: #E3F1FF;
   }
+
   background-color: #074487;
   color: #fff;
-  .el-input__inner{
+
+  .el-input__inner {
     background: color #074487;
   }
 
-  .el-input__inner{
+  .el-input__inner {
     background-color: #074487;
   }
-    .el-input.is-disabled .el-input__inner{
+
+  .el-input.is-disabled .el-input__inner {
     background-color: #074487;
   }
-    .el-date-range-picker__time-header{
+
+  .el-date-range-picker__time-header {
     background-color: #031a46;
   }
-    .el-picker-panel__footer{
+
+  .el-picker-panel__footer {
     background-color: #031a46;
   }
-    .el-time-panel{
-      background-color: #074487!important;
+
+  .el-time-panel {
+    background-color: #074487 !important;
     color: #E3F1FF;
   }
-    .el-picker-panel__icon-btn{
-      color:#E3F1FF;
+
+  .el-picker-panel__icon-btn {
+    color: #E3F1FF;
   }
-    .el-date-table th{
-      color:#E3F1FF;
+
+  .el-date-table th {
+    color: #E3F1FF;
   }
-    .el-time-spinner__item{
+
+  .el-time-spinner__item {
     color: #E3F1FF;
   }
-    .el-time-spinner__item.active:not(.disabled){
+
+  .el-time-spinner__item.active:not(.disabled) {
     color: #fff;
   }
-    .el-time-panel__btn{
-      color:#0F93F6;
+
+  .el-time-panel__btn {
+    color: #0F93F6;
   }
-    .el-time-panel__btn.confirm{
+
+  .el-time-panel__btn.confirm {
     width: 50px;
     height: 25px;
     line-height: 25px;
     border-radius: 3px;
     background-color: #fff;
   }
-    .el-time-panel__footer{
+
+  .el-time-panel__footer {
     background-color: #031a46;
   }
-    .el-date-table td.in-range div{
+
+  .el-date-table td.in-range div {
     background-color: #031a46;
   }
-    .el-date-table td.start-date span, .el-date-table td.end-date span{
+
+  .el-date-table td.start-date span,
+  .el-date-table td.end-date span {
     background-color: #074487;
-      //  border:1px solid saddlebrown;
     box-shadow: inset 0 0 7px #02D9FD;
     border: 1px solid #02D9FD;
   }
 }
-.el-date-editor{
 
-  .el-range-separator{
+.el-date-editor {
+  .el-range-separator {
     color: #E3F1FF;
   }
-  .el-range-input{
-    background:none !important;
+
+  .el-range-input {
+    background: none !important;
     color: #fff;
   }
-
-
 }
 
-
-
-
 .el-menu--horizontal .el-menu .el-menu-item,
 .el-select-dropdown__item,
 .el-menu--horizontal .el-menu .el-submenu__title {

@@ -62,12 +62,9 @@
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
-      <message-tips ref="msg" :message="message" />
     </div>
-    <!-- XML报文 -->
-    <xml-message ref="dialog" :xml="xml" />
-    <!-- 数据详情 -->
-    <edit-dialog ref="editLog" :bsmSjsb="bsmSjsb" :diaData="diaData" />
+    <!-- 编辑 -->
+    <dataDetails ref="editLog" :title="title" />
   </div>
 </template>
 <script>
@@ -76,13 +73,9 @@ import data from "./data"
 import business from '@/api/business'
 import dataReporting from '@/api/dataReporting'
 import tableMixin from '@/mixins/tableMixin.js'
-import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
   name: "Cfdj",
   mixins: [tableMixin],
-  components: {
-    editDialog
-  },
   data () {
     return {
       form: {
@@ -110,17 +103,16 @@ export default {
               return (
                 <div>
                   <el-button
-                    type='primary'
+                    type="primary"
                     size="mini"
-                    onClick={() => { this.handledetails(scope.$index, scope.row) }}
+                    onClick={() => { this.handleEdit(scope.row) }}
                   >
                     详情
                   </el-button>
                 </div>
-              );
-            },
-          },
-
+              )
+            }
+          }
         ]),
         data: []
       },
@@ -149,11 +141,8 @@ export default {
           total
         }
       } catch (error) {
-        this.message = error
         this.$refs.msg.messageShow()
       }
-    },
-    handledetails (index, row) {
     }
   }
 }

@@ -68,12 +68,9 @@
         :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>
-      <message-tips ref="msg" :message="message" />
     </div>
-    <!-- XML报文 -->
-    <xml-message ref="dialog" :xml="xml" />
-    <!-- 数据详情 -->
-    <edit-dialog ref="editLog" :bsmSjsb="bsmSjsb" :diaData="diaData" />
+    <!-- 编辑 -->
+    <dataDetails ref="editLog" :title="title" />
   </div>
 </template>
 
@@ -84,13 +81,11 @@ import business from '@/api/business'
 import dataReporting from '@/api/dataReporting'
 import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
-import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
   name: "dyaq",
   mixins: [tableMixin],
   components: {
     treeSelect,
-    editDialog
   },
   data () {
     return {
@@ -119,27 +114,16 @@ export default {
               return (
                 <div>
                   <el-button
-                    type="text"
+                    type="primary"
                     size="mini"
-                    icon="el-icon-folder"
-                    style="color:#67C23A"
-                    onClick={() => { this.handleXmlres(scope.$index, scope.row) }}
+                    onClick={() => { this.handleEdit(scope.row) }}
                   >
-                    XML报文
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    icon="el-icon-view"
-                    onClick={() => { this.handlDatadetails(scope.$index, scope.row) }}
-                  >
-                    数据详情
+                    详情
                   </el-button>
                 </div>
-              );
-            },
-          },
-
+              )
+            }
+          }
         ]),
         data: []
       },
@@ -153,10 +137,6 @@ export default {
     }
   },
   methods: {
-    // 是否显示下拉框
-    isShowSelectOptions (e) {
-      if (!e) this.$refs.selectmortgageReg.blur()
-    },
     async featchData () {
       try {
         let { result: { list, total, pages: pageSize, pageNum: current }
@@ -168,22 +148,8 @@ export default {
           total
         }
       } catch (error) {
-        this.message = error
-        this.$refs.msg.messageShow()
       }
-    },
-    handlDatadetails (index, row) {
-    },
-    async handlDatadetails (index, row) {
-      let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
-      if (res != null) {
-        this.diaData = res
-        this.bsmSjsb = row.BSM_SJSB
-        this.$store.dispatch('business/setEdit'); this.$refs.editLog.isShow()
-      } else {
-        this.$message(message)
     }
-    },
   }
 }
 </script>

@@ -74,7 +74,6 @@
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
-      <message-tips ref="msg" :message="message" />
     </div>
     <!-- 编辑 -->
     <dataDetails ref="editLog" :title="title" />
@@ -135,7 +134,7 @@ export default {
           },
 
         ]),
-        data: [{}]
+        data: []
       },
       pageData: {
         total: 0,
@@ -152,15 +151,14 @@ export default {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
         } = await business.getQlfQlDyiqList(this.form)
-        // this.tableData.data = list
+        this.tableData.data = list
         this.pageData = {
           pageSize,
           current,
           total
         }
       } catch (error) {
-        this.message = error
-        this.$refs.msg.messageShow()
+        // this.$refs.msg.messageShow()
       }
     }
   }

@@ -33,8 +33,8 @@
         <el-row class="mt-10">
           <el-col :span="6">
             <el-form-item label="登记类型">
-              <el-select v-model="form.djlx" clearable class="width100" ref="selectlandDJ" @visible-change="isShowSelectOptions"
-                placeholder="请选择登记类型">
+              <el-select v-model="form.djlx" clearable class="width100" ref="selectlandDJ"
+                @visible-change="isShowSelectOptions" placeholder="请选择登记类型">
                 <el-option v-for="item in DJLXOptions" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -77,11 +77,11 @@ export default {
   data () {
     return {
       form: {
-        pcode:'',
-        qszt:'',
+        pcode: '',
+        qszt: '',
         zl: '',
         qlr: '',
-        djlx:'',
+        djlx: '',
         bdcqzh: '',
         currentPage: 1
       },
@@ -172,20 +172,7 @@ export default {
         this.message = error
         // this.$refs.msg.messageShow()
       }
-    },
-    handlDatadetails (index, row) {
-      this.$store.dispatch('business/setEdit'); this.$refs.editLog.isShow()
-    },
-    async handlDatadetails (index, row) {
-      let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
-      if (res != null) {
-        this.diaData = res
-        this.bsmSjsb = row.BSM_SJSB
-        this.$store.dispatch('business/setEdit'); this.$refs.editLog.isShow()
-      } else {
-        this.$message(message);
     }
-    },
   }
 }
 </script>

@@ -4,10 +4,33 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
+            <el-form-item label="行政区" label-width="80px">
+              <el-select v-model="form.xzq" class="width100" clearable placeholder="行政区">
+                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="权属状态">
+              <el-select v-model="form.qszt" class="width100" clearable placeholder="权属状态">
+                <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="不动产权证号">
+              <el-input v-model="form.bdcqzh" placeholder="不动产权证号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
             <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="4">
             <el-form-item label="预告登记种类" label-width="106px">
               <el-select v-model="form.YGDJZL" clearable ref="selectnoticeRegQL" @visible-change="isShowSelectOptions"
@@ -20,7 +43,7 @@
           <el-col :span="5">
             <el-form-item label="登记类型">
               <el-select v-model="form.DJLX" clearable class="width100" placeholder="请选择登记类型">
-                <el-option v-for="item in DJLXOptions" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in dicData['A21']" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -41,12 +64,9 @@
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
-      <message-tips ref="msg" :message="message" />
     </div>
-    <!-- XML报文 -->
-    <xml-message ref="dialog" :xml="xml" />
-    <!-- 数据详情 -->
-    <edit-dialog ref="editLog" :bsmSjsb="bsmSjsb" :diaData="diaData" />
+    <!-- 编辑 -->
+    <dataDetails ref="editLog" :title="title" />
   </div>
 </template>
 
@@ -68,7 +88,11 @@ export default {
   data () {
     return {
       form: {
+        xzq: '',
+        qszt: '',
+        bdcqzh: '',
         YWH: '',
+
         YGDJZL: '',
         DJLX: '',
         BDCDYH: '',
@@ -88,17 +112,16 @@ export default {
               return (
                 <div>
                   <el-button
-                    type="text"
+                    type="primary"
                     size="mini"
-                    icon="el-icon-view"
-                    onClick={() => { this.handledetails(scope.$index, scope.row) }}
+                    onClick={() => { this.handleEdit(scope.row) }}
                   >
-                    数据详情
+                    详情
                   </el-button>
                 </div>
-              );
-            },
-          },
+              )
+            }
+          }
         ]),
         data: []
       },
@@ -146,11 +169,8 @@ export default {
           total
         }
       } catch (error) {
-        this.message = error
         this.$refs.msg.messageShow()
       }
-    },
-    handledetails (index, row) {
     }
   }
 }

@@ -54,16 +54,14 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" :heightNum="340" :current-page.sync="pageData.current" :total="pageData.total"
+      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
       <message-tips ref="msg" :message="message" />
     </div>
-    <!-- XML报文 -->
-    <xml-message ref="dialog" :xml="xml" />
-    <!-- 数据详情 -->
-    <edit-dialog ref="editLog" :bsmSjsb="bsmSjsb" :diaData="diaData" />
+    <!-- 编辑 -->
+    <dataDetails ref="editLog" :title="title" />
   </div>
 </template>
 
@@ -73,13 +71,9 @@ import data from "./data"
 import business from '@/api/business'
 import dataReporting from '@/api/dataReporting'
 import tableMixin from '@/mixins/tableMixin.js'
-import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
   name: "cancellationReg",
   mixins: [tableMixin],
-  components: {
-    editDialog
-  },
   data () {
     return {
       form: {
@@ -141,21 +135,6 @@ export default {
         this.message = error
         this.$refs.msg.messageShow()
       }
-    },
-    async handlDatadetails (index, row) {
-      let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
-      if (res != null) {
-        this.diaData = res
-        this.bsmSjsb = row.BSM_SJSB
-        this.$store.dispatch('business/setEdit'); this.$refs.editLog.isShow()
-      } else {
-        this.$message(message)
-      }
-    },
-    // 详情
-    handleEdit (row) {
-      this.title = row.rectypeName
-      this.$refs.editLog.isShow(row);
     }
   }
 }