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

@@ -32,22 +32,6 @@ export function Init(data) {
         data
     })
 }
-// 初始化内容
-export function saveData (data) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/ywbl/fdcq2lr/saveData',
-    method: 'post',
-    data
-  })
-}
-// 注销登记提交数据
-export function saveLogoutData(data) {
-    return request({
-        url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveLogoutData",
-        method: 'post',
-        data
-    })
-}
 // 首次登记提交
 export function saveBatchData(data) {
   return request({
@@ -56,20 +40,5 @@ export function saveBatchData(data) {
     data
   })
 }
-// 更正/变更登记提交
-export function saveGZBatchData(data) {
-  return request({
-    url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveGZBatchData",
-    method: 'post',
-    data
-  })
-}
-// 更正/变更登记提交
-export function saveBHZData(data) {
-  return request({
-    url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveBHZData",
-    method: 'post',
-    data
-  })
-}
+
 

@@ -41,36 +41,5 @@ export function saveData (data) {
     data
   })
 }
-// 注销登记提交数据
-export function saveLogoutData(data) {
-    return request({
-        url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveLogoutData",
-        method: 'post',
-        data
-    })
-}
-// 首次登记提交
-export function saveBatchData(data) {
-  return request({
-    url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveBatchData",
-    method: 'post',
-    data
-  })
-}
-// 更正/变更登记提交
-export function saveGZBatchData(data) {
-  return request({
-    url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveGZBatchData",
-    method: 'post',
-    data
-  })
-}
-// 更正/变更登记提交
-export function saveBHZData(data) {
-  return request({
-    url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveBHZData",
-    method: 'post',
-    data
-  })
-}
+
 

@@ -109,7 +109,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" >
 @import "~@/styles/mixin.scss";
-@import "./dialogBox.scss";
+@import "~@/styles/dialogBox.scss";
 </style>
 <style rel="stylesheet/scss" scoped lang="scss" >
 /deep/.is-fullscreen {

-.dialogBox {
-    border-radius: 8px;
-    overflow: hidden;
-    background: #FFFFFF;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
-
-    .dialog_title {
-        display: flex;
-        position: relative;
-        top: -2px;
-
-        b {
-            @include flex-center;
-            flex: 1;
-            width: 100%;
-        }
-    }
-
-    .dialog_full {
-        position: absolute;
-        top: 0;
-        right: 30px;
-    }
-
-    .el-dialog__body {
-        max-height: 88vh;
-        overflow-x: hidden;
-        overflow-y: hidden;
-    }
-
-    .dialog_footer {
-        margin-top: 8px;
-        @include flex-center;
-    }
-
-
-}
-
-.dialog_title {
-    @include flex;
-    justify-content: space-between;
-    width: 100%;
-}
-
-.el-dialog__header {
-    margin-bottom: 10px;
-    color: #4A4A4A;
-    background-color: #FCFDFD;
-    border-bottom: 1px solid #E4EBF4;
-}
-
-.el-dialog__body {
-    padding-top: 10px;
-    padding-bottom: 0;
-}
-
-.el-dialog__headerbtn .el-dialog__close {
-    color: #6B7A99 !important;
-    position: relative;
-    top: -2px;
-}
-
-
-.el-form-item {
-    @include flex;
-    width: 100%;
-}
-
-.el-dialog__wrapper {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
-.contentCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(calc(-50% + 85px), -50%);
-}
-
-.mainCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
\ No newline at end of file

@@ -109,7 +109,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" >
 @import "~@/styles/mixin.scss";
-@import "./dialogBox.scss";
+@import "~@/styles/dialogBox.scss";
 </style>
 <style rel="stylesheet/scss" scoped lang="scss" >
 /deep/.is-fullscreen {

@@ -277,6 +277,14 @@ export const asyncRoutes = [
         name: 'flfg',
         meta: { title: '法律法规' }
       },
+      {
+        path: 'gxhpz',
+        id: '97',
+        parentId: '9',
+        component: () => import('@/views/system/gxhpz/gxhpz.vue'),
+        name: 'gxhpz',
+        meta: { title: '个性化配置' }
+      },
     ]
   },
   {

 .dialogBox {
-    border-radius: 8px;
-    overflow: hidden;
-    background: #FFFFFF;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
-
-    .dialog_title {
-        display: flex;
-        position: relative;
-        top: -2px;
-
-        b {
-            @include flex-center;
-            flex: 1;
-            width: 100%;
-        }
-    }
+  border-radius: 8px;
+  overflow: hidden;
+  background: #FFFFFF;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
 
-    .dialog_full {
-        position: absolute;
-        top: 0;
-        right: 30px;
-    }
+  .dialog_title {
+    display: flex;
+    position: relative;
+    top: -2px;
 
-    .el-dialog__body {
-        max-height: 88vh;
-        overflow-x: hidden;
-        overflow-y: hidden;
+    b {
+      @include flex-center;
+      flex: 1;
+      width: 100%;
     }
+  }
 
-    .dialog_footer {
-        margin-top: 8px;
-        @include flex-center;
-    }
+  .dialog_full {
+    position: absolute;
+    top: 0;
+    right: 30px;
+  }
+
+  .el-dialog__body {
+    max-height: 88vh;
+    overflow-x: hidden;
+    overflow-y: hidden;
+  }
+
+  .dialog_footer {
+    margin-top: 8px;
+    @include flex-center;
+  }
 
 
 }
 
 .dialog_title {
-    @include flex;
-    justify-content: space-between;
-    width: 100%;
+  @include flex;
+  justify-content: space-between;
+  width: 100%;
 }
 
 .el-dialog__header {
-    margin-bottom: 10px;
-    color: #4A4A4A;
-    background-color: #FCFDFD;
-    border-bottom: 1px solid #E4EBF4;
+  margin-bottom: 10px;
+  color: #4A4A4A;
+  background-color: #FCFDFD;
+  border-bottom: 1px solid #E4EBF4;
 }
 
 .el-dialog__body {
-    padding-top: 10px;
-    padding-bottom: 0;
+  padding-top: 10px;
+  padding-bottom: 0;
 }
 
 .el-dialog__headerbtn .el-dialog__close {
-    color: #6B7A99 !important;
-    position: relative;
-    top: -2px;
+  color: #6B7A99 !important;
+  position: relative;
+  top: -2px;
 }
 
 
 .el-form-item {
-    @include flex;
-    width: 100%;
+  @include flex;
+  width: 100%;
 }
 
 .el-dialog__wrapper {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 
 .contentCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(calc(-50% + 85px), -50%);
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(calc(-50% + 85px), -50%);
 }
 
 .mainCenter {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
\ No newline at end of file

@@ -93,7 +93,7 @@
           <i class="el-icon-s-unfold pointer"></i>
         </div>
         <ul>
-          <li v-for="(item, index) in doneList" :key="index" class="flexst dynamicInfo">
+          <li v-for="(item, index) in doneList.slice(0, 10)" :key="index" class="flexst dynamicInfo">
             <p class="right15">{{ item.dealTime.substring(0, 10) }}</p>
             <p class="list-title">{{ item.dealBusiness }} ({{ item.dealStep + '环节' }})</p>
           </li>

+<template>
+    <div class="from-clues">
+      <!-- 表单部分 -->
+      <div class="from-clues-header">
+        <el-form :model="ruleForm" label-width="80px">
+          <el-row>
+            <el-col :span="5">
+              <el-form-item label="个性化配置">
+                <el-input ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="19" class="btnColRight">
+              <el-form-item>
+                <el-button type="primary" native-type="submit" >查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 表格 -->
+    </div>
+  </template>
+  <script>
+  import table from "@/utils/mixin/table";
+  export default {
+    name: "gxhpz",
+    components: {  },
+    mixins: [table],
+    mounted () {
+    },
+    data () {
+      return {
+        isDialog: false,
+        isDiglog: false
+      }
+    },
+    methods: {
+    },
+  };
+  </script>
+  <style scoped lang="scss">
+  @import "~@/styles/public.scss";
+  </style>
+  
\ No newline at end of file

@@ -65,7 +65,7 @@ export default {
         },
         {
           label: '是否必填',
-          width: '100',
+          width: '130',
           render: (h, scope) => {
             return (
               <el-radio-group v-model={scope.row.isrequired} onChange={(val) => { scope.row[scope.column.property] = val }}>

@@ -243,7 +243,7 @@ export default {
   }
 }
 </script>
-<style lang='scss'>
+<style lang='scss' scoped>
 .djqxsd {
   .repeat {
     .el-input__inner {

@@ -320,7 +320,7 @@ export default {
 @import "~@/styles/mixin.scss";
 
 /deep/.el-radio {
-  margin-right: 8px;
+  margin-right: 0;
 }
 
 /deep/.el-radio__label {

@@ -12,18 +12,9 @@ export function getForm(tabName, djywbm) {
         case "fwsyqslxx100":
             form = require("@/views/ywbl/fdcq2/slxx.vue");
             break;
-        case "fwsyqslxx200":
-            form = require("@/views/ywbl/fdcq2/slxx200.vue");
-            break;
         case "fwsyqslxx300":
             form = require("@/views/ywbl/fdcq2/slxx300.vue");
             break;
-        case "fwsyqslxx400":
-            form = require("@/views/ywbl/fdcq2/slxx400.vue");
-            break;
-        case "fwsyqslxx900":
-            form = require("@/views/ywbl/fdcq2/slxx900.vue");
-            break;
         case "nydsyqslxx100":
             form = require("@/views/ywbl/nydsyq/slxx.vue");
             break;

@@ -131,15 +131,16 @@
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
-          <el-col :span="14" v-if="ruleForm.qlxx">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
+         <el-col :span="14" v-if="ruleForm.qlxx">
+           <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
               <el-radio-group :disabled="$route.query.viewtype==1" @change="showCZInfo" v-model="ruleForm.slywxx.gyfs">
-                <el-radio label="1">单独所有</el-radio>
-                <el-radio label="2">共同共有</el-radio>
-                <el-radio label="3">按份所有</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+               <el-radio label="0">单独所有</el-radio>
+               <el-radio label="1">共同共有</el-radio>
+               <el-radio label="2">按份所有</el-radio>
+               <el-radio label="3">其它共有</el-radio>
+             </el-radio-group>
+           </el-form-item>
+         </el-col>
           <el-col :span="5">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="发证方式：">
               <el-radio-group v-model="ruleForm.slywxx.fzfs">
@@ -168,6 +169,15 @@
         </el-row>
         <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
                           :gyfs="ruleForm.qlxx.gyfs" />
+
+        <div v-if="ruleForm.ywrList.length>0">
+          <div class="slxx_title title-block">
+            义务人信息
+            <div class="triangle"></div>
+          </div>
+          <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateYwrxxList" :tableData="ruleForm.ywrList"
+                            :gyfs="ruleForm.qlxx.gyfs" />
+        </div>
         <div class="slxx_title title-block">
           登记原因
           <div class="triangle"></div>

@@ -129,7 +129,7 @@ export default {
       this.$emit("closeDialog");
     },
     fetchData() {
-      this.queryForm.sqywbm = this.djywbm;
+      this.queryForm.bsmSqyw = this.djqxObj.parentid;
       selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;

@@ -18,8 +18,8 @@
       <div class="right-type el-card box-card is-always-shadow" v-if="n == -1">
         <div class="right-title">登记类型</div>
         <ul class="type-content">
-          <li :class="item.cselect ? 'cactive' : ''" @click="handleDjlxSelect(item)" v-for="(item, index) in djlxList"
-            :key="index">
+          <li :class="item.cselect ? 'cactive' : ''" @dblclick="handleDjqxItem(item)" @click="handleDjlxSelect(item)"
+            v-for="(item, index) in djlxList" :key="index">
             <p>
               {{ item.nodename }}
             </p>
@@ -33,8 +33,8 @@
       <div class="right-situation el-card box-card is-always-shadow">
         <div class="right-title">{{ obj[n] }}</div>
         <ul>
-          <li v-for="(item, index) in itemList" :key="index" @click="handleSelectYw(item, itemList)"
-            :class="item.cselect ? 'cactive' : ''">
+          <li v-for="(item, index) in itemList" :key="index" @dblclick="handleSelectItem(item, itemList)"
+            @click="handleSelectYw(item, itemList)" :class="item.cselect ? 'cactive' : ''">
             <p v-if="n == 0">
               {{ item.djywmc }}<br>
               {{ item.nodename }}
@@ -79,11 +79,7 @@ export default {
       isDialog: false,
       btnDisabled: true,
       djywbm: '',
-
-      djqxObj: {
-        djqxbm: '',
-        djqxmc: ''
-      },
+      djqxObj: {},
       bsmSqyw: ''
     }
   },
@@ -127,10 +123,8 @@ export default {
       list.forEach(item => {
         this.$set(item, 'cselect', false)
       })
-      item.cselect = true
-      this.djqxObj.djqxbm = item.nodecode
-      this.djqxObj.djqxmc = item.djqxmc
-
+      item.cselect = true;
+      this.djqxObj = item;
       if (item.sffqlc == '1') {
         this.btnDisabled = false
         this.bsmSqyw = item.bsmSqyw
@@ -224,6 +218,23 @@ export default {
       }
       this.djqxList = []
     },
+    handleDjqxItem (item) {
+      this.djlxList.forEach(item => {
+        item.cselect = false
+      })
+      console.log(item);
+      if (item.sffqlc == 1) {
+        this.djywbm = item.djywbm
+        this.bsmSqyw = item.bsmSqyw
+        item.cselect = true
+        this.isDialog = true
+        this.btnDisabled = true
+      }
+    },
+    handleSelectItem (item, list) {
+      this.handleSelectYw(item, list)
+      this.isDialog = true
+    },
     // 选择不动产信息
     bthSelectClick () {
       this.isDialog = true