Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
ed18c1ed by liangyifan
Options

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
2 parents fb1876fa 4fd3a224
Inline Side-by-side
Showing 7 changed files with 43 additions and 25 deletions
...@@ -92,7 +92,9 @@ export default { ...@@ -92,7 +92,9 @@ export default {
92 } 92 }
93 }, 93 },
94 submitForm () { 94 submitForm () {
95 if (this.isButton) {
95 this.$emit('submitForm'); 96 this.$emit('submitForm');
97 }
96 }, 98 },
97 closeDialog () { 99 closeDialog () {
98 this.key++ 100 this.key++
......
1 <template> 1 <template>
2 <dialogBox title="家庭房产查询" @closeDialog="closeDialog" width="80%" :isButton="false" v-model="value"> 2 <dialogBox title="家庭房产查询" @closeDialog="closeDialog" width="80%" :isButton="false" v-model="value">
3 <div class="jtfccx-edit">
4 <div class="jtfccx-edit-con">
3 <b class="title">申请信息</b> 5 <b class="title">申请信息</b>
4 <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting :pagination="false"> 6 <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting
7 :pagination="false">
5 </lb-table> 8 </lb-table>
6 <el-form :model="ruleForm" label-width="100px"> 9 <el-form :model="ruleForm" label-width="100px">
7 <el-row> 10 <el-row>
...@@ -22,10 +25,11 @@ ...@@ -22,10 +25,11 @@
22 </el-row> 25 </el-row>
23 </el-form> 26 </el-form>
24 <b class="title">权利人</b> 27 <b class="title">权利人</b>
25 <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting :pagination="false"> 28 <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting
29 :pagination="false">
26 </lb-table> 30 </lb-table>
27 <div class="submit-button"> 31 <div class="submit-button">
28 <el-button type="primary" @click="onSubmit">查询</el-button> 32 <el-button type="primary">查询</el-button>
29 <el-button>重置</el-button> 33 <el-button>重置</el-button>
30 </div> 34 </div>
31 <b class="title">查询结果</b> 35 <b class="title">查询结果</b>
...@@ -33,10 +37,13 @@ ...@@ -33,10 +37,13 @@
33 <lb-table :column="searchData.columns" :data="searchData.data" :maxHeight="200" heightNumSetting 37 <lb-table :column="searchData.columns" :data="searchData.data" :maxHeight="200" heightNumSetting
34 :pagination="false"> 38 :pagination="false">
35 </lb-table> 39 </lb-table>
40 </div>
41
36 <div class="submit-button" style="padding-bottom:20px"> 42 <div class="submit-button" style="padding-bottom:20px">
37 <el-button type="primary" @click="onSubmit">打印（1）</el-button> 43 <el-button type="primary">打印（1）</el-button>
38 <el-button @click="closeDialog">关闭</el-button> 44 <el-button @click="closeDialog">关闭</el-button>
39 </div> 45 </div>
46 </div>
40 </dialogBox> 47 </dialogBox>
41 </template> 48 </template>
42 49
...@@ -224,7 +231,23 @@ export default { ...@@ -224,7 +231,23 @@ export default {
224 border-bottom: 1px solid $borderColor; 231 border-bottom: 1px solid $borderColor;
225 } 232 }
226 233
227 .submit-button { 234 .jtfccx-edit {
235 @include flex;
236 flex-direction: column;
237 overflow-y: hidden;
238 max-height: 87vh;
239
240 .jtfccx-edit-con {
241 flex: 1;
242 height: 100%;
243 overflow-y: scroll;
244 }
245
246 .submit-button {
228 text-align: center; 247 text-align: center;
248 height: 52px;
249 padding-top: 10px;
250 background-color: #fff;
251 }
229 } 252 }
230 </style> 253 </style>
......
...@@ -24,8 +24,10 @@ class data extends filter { ...@@ -24,8 +24,10 @@ class data extends filter {
24 label: "查询类型", 24 label: "查询类型",
25 }, 25 },
26 { 26 {
27 prop:"cxbh",
28 label: "查询编号", 27 label: "查询编号",
28 render: (h, scope) => {
29 return <el-button type="text" onClick={() => { vm.openDialog() }}>{scope.row.cxbh}</el-button>
30 }
29 }, 31 },
30 { 32 {
31 prop: "cxsj", 33 prop: "cxsj",
......
...@@ -79,6 +79,7 @@ export default { ...@@ -79,6 +79,7 @@ export default {
79 } 79 }
80 }); 80 });
81 }, 81 },
82
82 data () { 83 data () {
83 return { 84 return {
84 queryForm: { 85 queryForm: {
...@@ -92,7 +93,6 @@ export default { ...@@ -92,7 +93,6 @@ export default {
92 size: 10, 93 size: 10,
93 total: 0, 94 total: 0,
94 }, 95 },
95
96 tableData: { 96 tableData: {
97 columns: datas.columns(), 97 columns: datas.columns(),
98 data: [], 98 data: [],
......
...@@ -79,7 +79,7 @@ class data extends filter { ...@@ -79,7 +79,7 @@ class data extends filter {
79 align: 'center', 79 align: 'center',
80 fixed: 'right', 80 fixed: 'right',
81 render: (h, scope) => { 81 render: (h, scope) => {
82 return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.openDialog(scope) }}>编辑</el-button> 82 return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
83 } 83 }
84 } 84 }
85 ] 85 ]
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <el-col :span="5"> 7 <el-col :span="5">
8 <el-form-item label="业务来源"> 8 <el-form-item label="业务来源">
9 <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源"> 9 <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源">
10 <el-option v-for="item in ywlys" :key="item.value" :label="item.label" :value="item.value"> 10 <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
11 </el-option> 11 </el-option>
12 </el-select> 12 </el-select>
13 </el-form-item> 13 </el-form-item>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 <el-col :span="5"> 15 <el-col :span="5">
16 <el-form-item label="权利类型"> 16 <el-form-item label="权利类型">
17 <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型"> 17 <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
18 <el-option v-for="item in qllxs" :key="item.value" :label="item.label" :value="item.value"> 18 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
19 </el-option> 19 </el-option>
20 </el-select> 20 </el-select>
21 </el-form-item> 21 </el-form-item>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 <el-col :span="5"> 23 <el-col :span="5">
24 <el-form-item label="登记类型"> 24 <el-form-item label="登记类型">
25 <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型"> 25 <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型">
26 <el-option v-for="item in djlxs" :key="item.value" :label="item.label" :value="item.value"> 26 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
27 </el-option> 27 </el-option>
28 </el-select> 28 </el-select>
29 </el-form-item> 29 </el-form-item>
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
54 </div> 54 </div>
55 </template> 55 </template>
56 <script> 56 <script>
57 import { mapGetters } from 'vuex'
57 import table from "@/utils/mixin/table"; 58 import table from "@/utils/mixin/table";
58 import { datas, sendThis } from "./ybxdata"; 59 import { datas, sendThis } from "./ybxdata";
59 export default { 60 export default {
...@@ -63,6 +64,9 @@ export default { ...@@ -63,6 +64,9 @@ export default {
63 mounted () { 64 mounted () {
64 sendThis(this); 65 sendThis(this);
65 }, 66 },
67 computed: {
68 ...mapGetters(['dictData'])
69 },
66 data () { 70 data () {
67 return { 71 return {
68 queryForm: { 72 queryForm: {
...@@ -76,9 +80,6 @@ export default { ...@@ -76,9 +80,6 @@ export default {
76 size: 10, 80 size: 10,
77 total: 2, 81 total: 2,
78 }, 82 },
79
80 ywlys: datas.ywlys(),
81
82 tableData: { 83 tableData: {
83 columns: datas.columns(), 84 columns: datas.columns(),
84 data: [ 85 data: [
......
...@@ -63,21 +63,11 @@ class data extends filter { ...@@ -63,21 +63,11 @@ class data extends filter {
63 align: 'center', 63 align: 'center',
64 fixed: 'right', 64 fixed: 'right',
65 render: (h, scope) => { 65 render: (h, scope) => {
66 return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.openDialog(scope) }}>编辑</el-button> 66 return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button>
67 } 67 }
68 } 68 }
69 ] 69 ]
70 } 70 }
71
72 ywlys(){
73 return[
74 { value: 1, label: "办事大厅" },
75 { value: 2, label: "微信小程序" },
76 { value: 3, label: "法院端" },
77 { value: 4, label: "银行端" },
78 ]
79 }
80
81 } 71 }
82 let datas = new data() 72 let datas = new data()
83 export { 73 export {
......