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

# Conflicts:
#	src/views/ywbl/dbx/dbx.vue
#	src/views/ywbl/dbx/dbxdata.js

@@ -92,7 +92,9 @@ export default {
       }
       }
     },
     },
     submitForm () {
     submitForm () {
-      this.$emit('submitForm');
+      if (this.isButton) { 
+        this.$emit('submitForm');
+      }
     },
     },
     closeDialog () {
     closeDialog () {
       this.key++
       this.key++

 <template>
 <template>
   <dialogBox title="家庭房产查询" @closeDialog="closeDialog" width="80%" :isButton="false" v-model="value">
   <dialogBox title="家庭房产查询" @closeDialog="closeDialog" width="80%" :isButton="false" v-model="value">
-    <b class="title">申请信息</b>
-    <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting :pagination="false">
-    </lb-table>
-    <el-form :model="ruleForm" label-width="100px">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="活动名称" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="活动名称" prop="name">
-            <el-radio-group v-model="ruleForm.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-row>
-    </el-form>
-    <b class="title">权利人</b>
-    <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting :pagination="false">
-    </lb-table>
-    <div class="submit-button">
-      <el-button type="primary" @click="onSubmit">查询</el-button>
-      <el-button>重置</el-button>
-    </div>
-    <b class="title">查询结果</b>
-    <p>查询编号：202200409</p>
-    <lb-table :column="searchData.columns" :data="searchData.data" :maxHeight="200" heightNumSetting
-      :pagination="false">
-    </lb-table>
-    <div class="submit-button" style="padding-bottom:20px">
-      <el-button type="primary" @click="onSubmit">打印（1）</el-button>
-      <el-button @click="closeDialog">关闭</el-button>
+    <div class="jtfccx-edit">
+      <div class="jtfccx-edit-con">
+        <b class="title">申请信息</b>
+        <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <el-form :model="ruleForm" label-width="100px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="活动名称" prop="name">
+                <el-input v-model="ruleForm.name"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="活动名称" prop="name">
+                <el-radio-group v-model="ruleForm.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-row>
+        </el-form>
+        <b class="title">权利人</b>
+        <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+        <div class="submit-button">
+          <el-button type="primary">查询</el-button>
+          <el-button>重置</el-button>
+        </div>
+        <b class="title">查询结果</b>
+        <p>查询编号：202200409</p>
+        <lb-table :column="searchData.columns" :data="searchData.data" :maxHeight="200" heightNumSetting
+          :pagination="false">
+        </lb-table>
+      </div>
+
+      <div class="submit-button" style="padding-bottom:20px">
+        <el-button type="primary">打印（1）</el-button>
+        <el-button @click="closeDialog">关闭</el-button>
+      </div>
     </div>
     </div>
   </dialogBox>
   </dialogBox>
 </template>
 </template>
@@ -224,7 +231,23 @@ export default {
   border-bottom: 1px solid $borderColor;
   border-bottom: 1px solid $borderColor;
 }
 }
 
 
-.submit-button {
-  text-align: center;
+.jtfccx-edit {
+  @include flex;
+  flex-direction: column;
+  overflow-y: hidden;
+  max-height: 87vh;
+
+  .jtfccx-edit-con {
+    flex: 1;
+    height: 100%;
+    overflow-y: scroll;
+  }
+
+  .submit-button {
+    text-align: center;
+    height: 52px;
+    padding-top: 10px;
+    background-color: #fff;
+  }
 }
 }
 </style>
 </style>

@@ -23,9 +23,11 @@ class data extends filter {
         prop: "cxlx",
         prop: "cxlx",
         label: "查询类型",
         label: "查询类型",
       },
       },
-      { 
-        prop:"cxbh",
+      {
         label: "查询编号",
         label: "查询编号",
+        render: (h, scope) => {
+          return <el-button type="text" onClick={() => { vm.openDialog() }}>{scope.row.cxbh}</el-button>
+        }
       },
       },
       {
       {
         prop: "cxsj",
         prop: "cxsj",

@@ -79,6 +79,7 @@ export default {
            }
            }
 });
 });
   },
   },
+
   data () {
   data () {
     return {
     return {
       queryForm: {
       queryForm: {
@@ -92,7 +93,6 @@ export default {
         size: 10,
         size: 10,
         total: 0,
         total: 0,
       },
       },
-
       tableData: {
       tableData: {
         columns: datas.columns(),
         columns: datas.columns(),
         data: [],
         data: [],

@@ -27,8 +27,8 @@ class data extends filter {
               return <span>进行中</span>
               return <span>进行中</span>
             case '2':
             case '2':
               return <span>进行中</span>
               return <span>进行中</span>
-              case '3':
-                return <span>进行中</span>
+            case '3':
+              return <span>进行中</span>
           }
           }
         }
         }
       },
       },
@@ -40,7 +40,7 @@ class data extends filter {
         label: '业务号',
         label: '业务号',
         align: 'center',
         align: 'center',
         render: (h, scope) => {
         render: (h, scope) => {
-          return  <el-button type="text"  onClick={() => { vm.ywhClick(scope.row.bsmSlsq) }}>{scope.row.ywh}</el-button>
+          return <el-button type="text" onClick={() => { vm.ywhClick(scope.row.bsmSlsq) }}>{scope.row.ywh}</el-button>
         }
         }
       },
       },
       {
       {
@@ -79,7 +79,7 @@ class data extends filter {
         align: 'center',
         align: 'center',
         fixed: 'right',
         fixed: 'right',
         render: (h, scope) => {
         render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
+          return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
         }
         }
       }
       }
     ]
     ]

@@ -7,7 +7,7 @@
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="业务来源">
             <el-form-item label="业务来源">
               <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源">
               <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源">
-                <el-option v-for="item in ywlys" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -15,7 +15,7 @@
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="权利类型">
             <el-form-item label="权利类型">
               <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
               <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
-                <el-option v-for="item in qllxs" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -23,7 +23,7 @@
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="登记类型">
             <el-form-item label="登记类型">
               <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型">
               <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型">
-                <el-option v-for="item in djlxs" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -54,6 +54,7 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
+import { mapGetters } from 'vuex'
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./ybxdata";
 import { datas, sendThis } from "./ybxdata";
 export default {
 export default {
@@ -63,6 +64,9 @@ export default {
   mounted () {
   mounted () {
     sendThis(this);
     sendThis(this);
   },
   },
+  computed: {
+    ...mapGetters(['dictData'])
+  },
   data () {
   data () {
     return {
     return {
       queryForm: {
       queryForm: {
@@ -76,9 +80,6 @@ export default {
         size: 10,
         size: 10,
         total: 2,
         total: 2,
       },
       },
-
-      ywlys: datas.ywlys(),
-
       tableData: {
       tableData: {
         columns: datas.columns(),
         columns: datas.columns(),
         data: [
         data: [

@@ -63,21 +63,11 @@ class data extends filter {
         align: 'center',
         align: 'center',
         fixed: 'right',
         fixed: 'right',
         render: (h, scope) => {
         render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
+          return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
         }
         }
       }
       }
     ]
     ]
   }
   }
-
-  ywlys(){
-    return[
-      { value: 1, label: "办事大厅" },
-      { value: 2, label: "微信小程序" },
-      { value: 3, label: "法院端" },
-      { value: 4, label: "银行端" },
-    ]
-  } 
-
 }
 }
 let datas = new data()
 let datas = new data()
 export {
 export {