Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
f87d0abb by 任超
Options

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

2 parents dfcbe9fc 4aab3e56
Inline Side-by-side
Showing 18 changed files with 344 additions and 137 deletions
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import SERVER from './config' 2 import SERVER from './config'
3 // 获取家庭房产列表 3 // 获取申请查询列表
4 export function getJtfcPage (data) { 4 export function getSqcxPage (data) {
5 return request({ 5 return request({
6 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcPage', 6 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getSqcxPage',
7 method: 'post',
8 data
9 })
10 }
11
12 // 获取房屋明细列表
13 export function getFwmxPage (data) {
14 return request({
15 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxPage',
16 method: 'post', 7 method: 'post',
17 data 8 data
18 }) 9 })
...@@ -45,6 +36,15 @@ export function getJtfcInfo (params) { ...@@ -45,6 +36,15 @@ export function getJtfcInfo (params) {
45 }) 36 })
46 } 37 }
47 38
39 // 获取房屋明细记录详细信息
40 export function getFwmxInfo (params) {
41 return request({
42 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxInfo/',
43 method: 'get',
44 params
45 })
46 }
47
48 // 打印家庭房产 48 // 打印家庭房产
49 export function printJtcfInfo (data) { 49 export function printJtcfInfo (data) {
50 return request({ 50 return request({
......
1
2 /deep/.modifycollapse{
3
4 .el-collapse-item__header{
5 margin-bottom: 10px;
6 background: #F3F4F7;
7 border: 1px solid #D9D9D9;
8 border-radius: 4px;
9 font-size: 16px;
10 font-family: PingFangSC-Medium, PingFang SC;
11 font-weight: 500;
12 color: #333333;
13 line-height: 18px;
14
15 }
16 .el-collapse-item__header::before{
17 content: "";
18 margin-left: 10px;
19 margin-right: 10px;
20 width: 4px;
21 height: 18px;
22 background: #2B7FF1;
23 }
24 .el-collapse-item__arrow{
25 color: #979797 ;
26 margin-left: 10px;
27 }
28
29
30 }
31
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 } 23 }
24 24
25 .el-dialog__body { 25 .el-dialog__body {
26 max-height: 88vh; 26 max-height: 90vh;
27 overflow-x: hidden; 27 overflow-x: hidden;
28 overflow-y: hidden; 28 overflow-y: hidden;
29 } 29 }
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 </template> 53 </template>
54 54
55 <script> 55 <script>
56 import { addFwmxCxjgXx, getJtfcInfo,printJtcfInfo } from "@/api/sqcx"; 56 import { addFwmxCxjgXx, getFwmxInfo,printJtcfInfo } from "@/api/sqcx";
57 import { getPrintTemplateByCode } from "@/api/system"; 57 import { getPrintTemplateByCode } from "@/api/system";
58 import { datas, sendThis } from "./dydjbdata"; 58 import { datas, sendThis } from "./dydjbdata";
59 import { getLodop } from "@/utils/LodopFuncs" 59 import { getLodop } from "@/utils/LodopFuncs"
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
144 //加载详细信息 144 //加载详细信息
145 loadData () { 145 loadData () {
146 this.$startLoading(); 146 this.$startLoading();
147 getJtfcInfo({ sqcxBsm: this.sqcxBsm }).then((res) => { 147 getFwmxInfo({ sqcxBsm: this.sqcxBsm }).then((res) => {
148 this.$endLoading(); 148 this.$endLoading();
149 if (res.code == 200) { 149 if (res.code == 200) {
150 this.activeStep = 2; 150 this.activeStep = 2;
......
...@@ -36,10 +36,13 @@ ...@@ -36,10 +36,13 @@
36 36
37 <script> 37 <script>
38 import { datas, sendThis } from "./infodata"; 38 import { datas, sendThis } from "./infodata";
39 import { getJtfcInfo } from "@/api/sqcx"; 39 import { getFwmxInfo } from "@/api/sqcx";
40 export default { 40 export default {
41 props: { 41 props: {
42 42 formData: {
43 type: Object,
44 default: () => {},
45 },
43 }, 46 },
44 data () { 47 data () {
45 return { 48 return {
...@@ -65,10 +68,24 @@ export default { ...@@ -65,10 +68,24 @@ export default {
65 resultData: {}, 68 resultData: {},
66 }; 69 };
67 }, 70 },
68 mounted () { }, 71 mounted () {
72 if(this.formData){
73 this.getDetailInfo()
74 }
75 },
69 methods: { 76 methods: {
70 setResult(data){ 77 setResult(data){
71 this.resultData = data 78 this.resultData = data
79 },
80 getDetailInfo(){
81 this.$startLoading();
82 getFwmxInfo({ sqcxBsm: this.formData.bsmSqcx }).then((res) => {
83 this.$endLoading();
84 if (res.code == 200) {
85 this.resultData = res.result
86 }
87 });
88
72 } 89 }
73 }, 90 },
74 }; 91 };
......
...@@ -51,7 +51,7 @@ import table from "@/utils/mixin/table"; ...@@ -51,7 +51,7 @@ import table from "@/utils/mixin/table";
51 import { popupDialog } from "@/utils/popup.js"; 51 import { popupDialog } from "@/utils/popup.js";
52 import { datas, sendThis } from "./dydjbdata"; 52 import { datas, sendThis } from "./dydjbdata";
53 import addDydjb from "./components/addDydjb.vue"; 53 import addDydjb from "./components/addDydjb.vue";
54 import { getFwmxPage } from "@/api/sqcx"; 54 import { getSqcxPage } from "@/api/sqcx";
55 export default { 55 export default {
56 name: "dydjb", 56 name: "dydjb",
57 components: { addDydjb }, 57 components: { addDydjb },
...@@ -71,6 +71,7 @@ export default { ...@@ -71,6 +71,7 @@ export default {
71 cxbh: "", 71 cxbh: "",
72 sqr: "", 72 sqr: "",
73 ywh: "", 73 ywh: "",
74 cxlx: '2'
74 }, 75 },
75 tableData: { 76 tableData: {
76 columns: datas.columns(), 77 columns: datas.columns(),
...@@ -82,7 +83,7 @@ export default { ...@@ -82,7 +83,7 @@ export default {
82 // 初始化数据 83 // 初始化数据
83 queryClick () { 84 queryClick () {
84 this.$startLoading(); 85 this.$startLoading();
85 getFwmxPage({ ...this.queryForm, ...this.pageData }).then((res) => { 86 getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
86 this.$endLoading(); 87 this.$endLoading();
87 if (res.code === 200) { 88 if (res.code === 200) {
88 let { records, total } = res.result; 89 let { records, total } = res.result;
...@@ -92,19 +93,20 @@ export default { ...@@ -92,19 +93,20 @@ export default {
92 }); 93 });
93 }, 94 },
94 dydjbClick (scope) { 95 dydjbClick (scope) {
95 this.$nextTick(() => { 96 // this.$nextTick(() => {
96 this.isDialog = true 97 // this.isDialog = true
97 this.sqcxBsm = scope.row.bsmSqcx 98 // this.sqcxBsm = scope.row.bsmSqcx
98 }) 99 // })
99 // popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", { 100 popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
100 // bsmSqcx: scope.row.bsmSqcx, 101 bsmSqcx: scope.row.bsmSqcx,
101 // }); 102 });
102 }, 103 },
103 handleSort (name, sort) { 104 handleSort (name, sort) {
104 console.log(name, sort); 105 console.log(name, sort);
105 }, 106 },
106 openAddDialog(){ 107 openAddDialog(){
107 this.isDialog = true 108 this.isDialog = true
109 this.sqcxBsm = ''
108 } 110 }
109 }, 111 },
110 }; 112 };
......
...@@ -63,7 +63,7 @@ class data extends filter { ...@@ -63,7 +63,7 @@ class data extends filter {
63 label: "操作", 63 label: "操作",
64 width: 100, 64 width: 100,
65 render: (h, scope) => { 65 render: (h, scope) => {
66 return <el-button type="text" icon='el-icon-printer' onClick={() => { vm.dydjbClick(scope) }}>打印登记薄</el-button> 66 return <el-button type="text" icon='el-icon-view' onClick={() => { vm.dydjbClick(scope) }}>查看</el-button>
67 } 67 }
68 }, 68 },
69 69
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 <script> 46 <script>
47 import table from "@/utils/mixin/table"; 47 import table from "@/utils/mixin/table";
48 import { datas, sendThis } from "./jtfcdata"; 48 import { datas, sendThis } from "./jtfcdata";
49 import { getJtfcPage } from "@/api/sqcx"; 49 import { getSqcxPage } from "@/api/sqcx";
50 import addjtfc from "./components/addjtfc.vue"; 50 import addjtfc from "./components/addjtfc.vue";
51 export default { 51 export default {
52 name: "jtfc", 52 name: "jtfc",
...@@ -64,6 +64,7 @@ export default { ...@@ -64,6 +64,7 @@ export default {
64 queryForm: { 64 queryForm: {
65 cxbh: "", 65 cxbh: "",
66 sqr: "", 66 sqr: "",
67 cxlx: '1'
67 }, 68 },
68 tableData: { 69 tableData: {
69 columns: datas.columns(), 70 columns: datas.columns(),
...@@ -75,7 +76,7 @@ export default { ...@@ -75,7 +76,7 @@ export default {
75 // 初始化数据 76 // 初始化数据
76 queryClick () { 77 queryClick () {
77 this.$startLoading(); 78 this.$startLoading();
78 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { 79 getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
79 this.$endLoading(); 80 this.$endLoading();
80 if (res.code === 200) { 81 if (res.code === 200) {
81 let { records, total } = res.result; 82 let { records, total } = res.result;
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <script> 69 <script>
70 import table from "@/utils/mixin/table"; 70 import table from "@/utils/mixin/table";
71 import { datas, sendThis } from "./sqcxjldata"; 71 import { datas, sendThis } from "./sqcxjldata";
72 import { getJtfcPage } from "@/api/sqcx"; 72 import { getSqcxPage } from "@/api/sqcx";
73 export default { 73 export default {
74 name: "sqcxjl", 74 name: "sqcxjl",
75 mixins: [table], 75 mixins: [table],
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
94 // 初始化数据 94 // 初始化数据
95 queryClick () { 95 queryClick () {
96 this.$startLoading(); 96 this.$startLoading();
97 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { 97 getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
98 this.$endLoading(); 98 this.$endLoading();
99 if (res.code === 200) { 99 if (res.code === 200) {
100 let { records, total } = res.result; 100 let { records, total } = res.result;
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 </el-row> 136 </el-row>
137 </el-form> 137 </el-form>
138 <el-collapse accordion> 138 <el-collapse accordion>
139 <el-collapse-item title="登记情形设置" name="1"> 139 <el-collapse-item class="modifycollapse" title="登记情形设置" name="1">
140 <lb-table 140 <lb-table
141 :column="djqxCol" 141 :column="djqxCol"
142 border 142 border
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
146 > 146 >
147 </lb-table> 147 </lb-table>
148 </el-collapse-item> 148 </el-collapse-item>
149 <el-collapse-item title="材料信息设置" name="2"> 149 <el-collapse-item class="modifycollapse" title="材料信息设置" name="2">
150 <lb-table 150 <lb-table
151 :column="clxxCol" 151 :column="clxxCol"
152 border 152 border
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
157 </lb-table> 157 </lb-table>
158 </el-collapse-item> 158 </el-collapse-item>
159 <el-collapse-item 159 <el-collapse-item
160 class="modifycollapse"
160 title="刷选权利设置" 161 title="刷选权利设置"
161 name="3" 162 name="3"
162 v-if="form.ywDetail.sfsxql == '1'" 163 v-if="form.ywDetail.sfsxql == '1'"
...@@ -179,7 +180,7 @@ ...@@ -179,7 +180,7 @@
179 </li> 180 </li>
180 </ul> 181 </ul>
181 </el-collapse-item> 182 </el-collapse-item>
182 <el-collapse-item title="办理状态设置" name="4"> 183 <el-collapse-item class="modifycollapse" title="办理状态设置" name="4">
183 <ul class="screen-list"> 184 <ul class="screen-list">
184 <li v-for="(item, index) in form.sxzt" :key="index"> 185 <li v-for="(item, index) in form.sxzt" :key="index">
185 <div class="screen-list-left"> 186 <div class="screen-list-left">
...@@ -332,6 +333,7 @@ export default { ...@@ -332,6 +333,7 @@ export default {
332 <style lang='scss' scoped> 333 <style lang='scss' scoped>
333 @import "~@/styles/mixin.scss"; 334 @import "~@/styles/mixin.scss";
334 @import "~@/styles/dialogBox.scss"; 335 @import "~@/styles/dialogBox.scss";
336 @import "~@/styles/collapse.scss";
335 337
336 .contentBox { 338 .contentBox {
337 height: 75vh; 339 height: 75vh;
...@@ -414,4 +416,4 @@ export default { ...@@ -414,4 +416,4 @@ export default {
414 border-right: 1px solid $borderColor; 416 border-right: 1px solid $borderColor;
415 } 417 }
416 } 418 }
417 </style>
...\ No newline at end of file ...\ No newline at end of file
419 </style>
......
...@@ -77,8 +77,7 @@ export default { ...@@ -77,8 +77,7 @@ export default {
77 methods: { 77 methods: {
78 getList () { 78 getList () {
79 getUserCommonOpinion().then(res => { 79 getUserCommonOpinion().then(res => {
80 let { records } = res.result 80 this.tableData.data = res.result
81 this.tableData.data = records ? records : []
82 }) 81 })
83 }, 82 },
84 //新增常用意见 83 //新增常用意见
......
1 export default { 1 export default {
2 data () { 2 data() {
3 return { 3 return {
4 isSearch: false, 4 isSearch: false,
5 searchList: [], 5 searchList: [],
...@@ -7,18 +7,44 @@ export default { ...@@ -7,18 +7,44 @@ export default {
7 } 7 }
8 }, 8 },
9 methods: { 9 methods: {
10 moreQueryClick () { 10 // 点击高级查询弹出查询弹框
11
12 moreQueryClick() {
11 this.isSearch = true 13 this.isSearch = true
14
12 }, 15 },
13 handleSelect (bs, mc, code) { 16 // 查询事件
14 let that = this 17 handleSelect(bs, mc, code) {
15 this.dictData[bs].forEach(item => { 18 this.dictData[bs].forEach(item => {
16 if (item.dcode == this.queryForm[code]) { 19 if (item.dcode == this.queryForm[code]) {
17 this.searchForm[mc] = item.dname 20 this.searchForm[mc] = item.dname
18 } 21 }
19 }) 22 })
20 }, 23 },
21 handelItem (item, index) { 24 // 清空单个表单
25 handleEmpty(el) {
26 for (var i = 0; i < this.searchList.length; i++) {
27 if (el == this.searchList[i].zdm) {
28 this.searchList.splice(i, 1)
29 }
30 }
31 let obj = {
32 ywlymc: 'ywly',
33 qllxmc: 'qllx',
34 djlxmc: 'djlx'
35 }
36 if (obj[el]) {
37 this.queryForm[obj[el]] = ''
38 } else if (this.otherForm[[el]]) {
39 this.otherForm[[el]] = ''
40 } else {
41 this.queryForm[el] = ''
42 }
43 this.searchForm[el] = ''
44 },
45 // 删除单个查询条件
46
47 handelItem(item, index) {
22 let obj = { 48 let obj = {
23 ywlymc: 'ywly', 49 ywlymc: 'ywly',
24 qllxmc: 'qllx', 50 qllxmc: 'qllx',
...@@ -33,10 +59,8 @@ export default { ...@@ -33,10 +59,8 @@ export default {
33 this.queryForm[item.zdm] = '' 59 this.queryForm[item.zdm] = ''
34 } 60 }
35 this.searchForm[item.zdm] = '' 61 this.searchForm[item.zdm] = ''
36 this.iterationData()
37 this.queryClick()
38 }, 62 },
39 iterationData () { 63 iterationData() {
40 let obj = { 64 let obj = {
41 ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称', 65 ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称',
42 qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' 66 qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间'
...@@ -46,12 +70,13 @@ export default { ...@@ -46,12 +70,13 @@ export default {
46 if (value) return { name: obj[name], value, zdm: name } 70 if (value) return { name: obj[name], value, zdm: name }
47 }).filter(Boolean) 71 }).filter(Boolean)
48 }, 72 },
49 getSearch (val) { 73 getSearch(val) {
50 this.otherForm = val 74 this.otherForm = val
51 this.iterationData() 75 this.iterationData()
52 this.queryClick() 76 this.queryClick()
53 }, 77 },
54 hanldeCleanAll () { 78 // 清空查询条件
79 hanldeCleanAll() {
55 this.searchForm = {} 80 this.searchForm = {}
56 this.queryForm = { 81 this.queryForm = {
57 ywly: "", 82 ywly: "",
...@@ -59,6 +84,7 @@ export default { ...@@ -59,6 +84,7 @@ export default {
59 djlx: "", 84 djlx: "",
60 ywh: "" 85 ywh: ""
61 } 86 }
87 this.otherForm = {}
62 this.searchList = [] 88 this.searchList = []
63 this.queryClick() 89 this.queryClick()
64 } 90 }
......
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
9 <el-row> 9 <el-row>
10 <el-col :span="8"> 10 <el-col :span="8">
11 <el-form-item label="申请业务名称" prop="sqywmc"> 11 <el-form-item label="申请业务名称" prop="sqywmc">
12 <el-input v-model="ruleForm.sqywmc"></el-input> 12 <el-input v-model="ruleForm.sqywmc" placeholder="请输入申请业务名称"></el-input>
13 </el-form-item> 13 </el-form-item>
14 </el-col> 14 </el-col>
15 <el-col :span="8"> 15 <el-col :span="8">
16 <el-form-item label="权利人" prop="qlrmc"> 16 <el-form-item label="权利人" prop="qlrmc">
17 <el-input v-model="ruleForm.qlrmc"></el-input> 17 <el-input v-model="ruleForm.qlrmc" placeholder="请输入权利人"></el-input>
18 </el-form-item> 18 </el-form-item>
19 </el-col> 19 </el-col>
20 <el-col :span="8"> 20 <el-col :span="8">
21 <el-form-item label="义务人" prop="ywrmc"> 21 <el-form-item label="义务人" prop="ywrmc">
22 <el-input v-model="ruleForm.ywrmc"></el-input> 22 <el-input v-model="ruleForm.ywrmc" placeholder="请输入义务人"></el-input>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 </el-row> 25 </el-row>
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
45 export default { 45 export default {
46 props: { 46 props: {
47 value: { type: Boolean, default: false }, 47 value: { type: Boolean, default: false },
48 advancedForm:{type: Object, default: "" }
48 }, 49 },
49 data () { 50 data () {
50 return { 51 return {
...@@ -60,19 +61,31 @@ export default { ...@@ -60,19 +61,31 @@ export default {
60 watch: { 61 watch: {
61 value (val) { 62 value (val) {
62 this.myValue = val 63 this.myValue = val
64 },
65 advancedForm(){
66 this.ruleForm={...this.advancedForm}
63 } 67 }
64 }, 68 },
69
70
65 methods: { 71 methods: {
66 closeDialog () { 72 closeDialog () {
67 this.$emit('input', false) 73 this.$emit('input', false)
68 }, 74 },
69 resetForm () { 75 resetForm () {
70 this.$refs['ruleForm'].resetFields() 76 this.$refs['ruleForm'].resetFields()
77 this.ruleForm={
78 sqywmc: '',
79 qlrmc: '',
80 ywrmc: '',
81 slsj: ''
82 }
71 }, 83 },
72 submitForm () { 84 submitForm () {
73 this.$emit('getSearch', _.cloneDeep(this.ruleForm)) 85 this.$emit('getSearch', _.cloneDeep(this.ruleForm))
74 this.$emit('input', false) 86 this.$emit('input', false)
75 this.$refs['ruleForm'].resetFields() 87 this.$refs['ruleForm'].resetFields()
88
76 } 89 }
77 } 90 }
78 } 91 }
...@@ -88,4 +101,4 @@ export default { ...@@ -88,4 +101,4 @@ export default {
88 /deep/.el-icon-date { 101 /deep/.el-icon-date {
89 display: none; 102 display: none;
90 } 103 }
91 </style>
...\ No newline at end of file ...\ No newline at end of file
104 </style>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
15 class="width100" 15 class="width100"
16 filterable 16 filterable
17 @change="handleSelect('ywly', 'ywlymc', 'ywly')" 17 @change="handleSelect('ywly', 'ywlymc', 'ywly')"
18 @clear="handleEmpty('ywlymc')"
18 clearable 19 clearable
19 placeholder="请选择业务来源" 20 placeholder="请选择业务来源"
20 > 21 >
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
34 v-model="queryForm.qllx" 35 v-model="queryForm.qllx"
35 class="width100" 36 class="width100"
36 @change="handleSelect('A8', 'qllxmc', 'qllx')" 37 @change="handleSelect('A8', 'qllxmc', 'qllx')"
38 @clear="handleEmpty('qllxmc')"
37 filterable 39 filterable
38 clearable 40 clearable
39 placeholder="请选择权利类型" 41 placeholder="请选择权利类型"
...@@ -54,6 +56,7 @@ ...@@ -54,6 +56,7 @@
54 v-model="queryForm.djlx" 56 v-model="queryForm.djlx"
55 class="width100" 57 class="width100"
56 @change="handleSelect('A21', 'djlxmc', 'djlx')" 58 @change="handleSelect('A21', 'djlxmc', 'djlx')"
59 @clear="handleEmpty('djlxmc')"
57 filterable 60 filterable
58 clearable 61 clearable
59 placeholder="请选择登记类型" 62 placeholder="请选择登记类型"
...@@ -126,7 +129,11 @@ ...@@ -126,7 +129,11 @@
126 > 129 >
127 </lb-table> 130 </lb-table>
128 </div> 131 </div>
129 <searchBox v-model="isSearch" @getSearch="getSearch" /> 132 <searchBox
133 v-model="isSearch"
134 @getSearch="getSearch"
135 :advancedForm="otherForm"
136 />
130 </div> 137 </div>
131 </template> 138 </template>
132 <script> 139 <script>
...@@ -172,6 +179,7 @@ export default { ...@@ -172,6 +179,7 @@ export default {
172 this.queryClick(); 179 this.queryClick();
173 }; 180 };
174 }, 181 },
182
175 watch: { 183 watch: {
176 queryForm: { 184 queryForm: {
177 handler(newName, oldName) {}, 185 handler(newName, oldName) {},
...@@ -205,7 +213,6 @@ export default { ...@@ -205,7 +213,6 @@ export default {
205 } 213 }
206 }); 214 });
207 }, 215 },
208
209 handleSort(val) { 216 handleSort(val) {
210 this.queryForm.sortField = val.prop; 217 this.queryForm.sortField = val.prop;
211 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc"; 218 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
......
...@@ -2,45 +2,94 @@ ...@@ -2,45 +2,94 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <!-- 表单部分 --> 3 <!-- 表单部分 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px"> 5 <el-form
6 :model="queryForm"
7 ref="queryForm"
8 @submit.native.prevent
9 label-width="80px"
10 >
6 <el-row> 11 <el-row>
7 <el-col :span="5"> 12 <el-col :span="5">
8 <el-form-item label="业务来源" label-width="70px"> 13 <el-form-item label="业务来源" label-width="70px">
9 <el-select v-model="queryForm.ywly" @change="handleSelect('ywly', 'ywlymc', 'ywly')" class="width100" 14 <el-select
10 filterable clearable placeholder="请选择业务来源"> 15 v-model="queryForm.ywly"
11 <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 16 @change="handleSelect('ywly', 'ywlymc', 'ywly')"
17 @clear="handleEmpty('ywlymc')"
18 class="width100"
19 filterable
20 clearable
21 placeholder="请选择业务来源"
22 >
23 <el-option
24 v-for="item in dictData['ywly']"
25 :key="item.dcode"
26 :label="item.dname"
27 :value="item.dcode"
28 >
12 </el-option> 29 </el-option>
13 </el-select> 30 </el-select>
14 </el-form-item> 31 </el-form-item>
15 </el-col> 32 </el-col>
16 <el-col :span="5"> 33 <el-col :span="5">
17 <el-form-item label="权利类型"> 34 <el-form-item label="权利类型">
18 <el-select v-model="queryForm.qllx" @change="handleSelect('A8', 'qllxmc', 'qllx')" class="width100" 35 <el-select
19 filterable clearable placeholder="请选择权利类型"> 36 v-model="queryForm.qllx"
20 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 37 @change="handleSelect('A8', 'qllxmc', 'qllx')"
38 @clear="handleEmpty('qllxmc')"
39 class="width100"
40 filterable
41 clearable
42 placeholder="请选择权利类型"
43 >
44 <el-option
45 v-for="item in dictData['A8']"
46 :key="item.dcode"
47 :label="item.dname"
48 :value="item.dcode"
49 >
21 </el-option> 50 </el-option>
22 </el-select> 51 </el-select>
23 </el-form-item> 52 </el-form-item>
24 </el-col> 53 </el-col>
25 <el-col :span="5"> 54 <el-col :span="5">
26 <el-form-item label="登记类型"> 55 <el-form-item label="登记类型">
27 <el-select v-model="queryForm.djlx" @change="handleSelect('A21', 'djlxmc', 'djlx')" class="width100" 56 <el-select
28 filterable clearable placeholder="请选择登记类型"> 57 v-model="queryForm.djlx"
29 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 58 @change="handleSelect('A21', 'djlxmc', 'djlx')"
59 @clear="handleEmpty('djlxmc')"
60 class="width100"
61 filterable
62 clearable
63 placeholder="请选择登记类型"
64 >
65 <el-option
66 v-for="item in dictData['A21']"
67 :key="item.dcode"
68 :label="item.dname"
69 :value="item.dcode"
70 >
30 </el-option> 71 </el-option>
31 </el-select> 72 </el-select>
32 </el-form-item> 73 </el-form-item>
33 </el-col> 74 </el-col>
34 <el-col :span="5"> 75 <el-col :span="5">
35 <el-form-item label="业务号"> 76 <el-form-item label="业务号">
36 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" @clear="queryClick" clearable class="width200px"> 77 <el-input
78 placeholder="请输入业务号"
79 v-model="queryForm.ywh"
80 @clear="queryClick"
81 clearable
82 class="width200px"
83 >
37 </el-input> 84 </el-input>
38 </el-form-item> 85 </el-form-item>
39 </el-col> 86 </el-col>
40 87
41 <el-col :span="4" class="btnColRight"> 88 <el-col :span="4" class="btnColRight">
42 <el-form-item> 89 <el-form-item>
43 <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button> 90 <el-button type="primary" native-type="submit" @click="queryClick"
91 >查询</el-button
92 >
44 <el-button @click="moreQueryClick">高级查询</el-button> 93 <el-button @click="moreQueryClick">高级查询</el-button>
45 </el-form-item> 94 </el-form-item>
46 </el-col> 95 </el-col>
...@@ -50,43 +99,62 @@ ...@@ -50,43 +99,62 @@
50 <ul> 99 <ul>
51 <li v-for="(item, index) in searchList" :key="index"> 100 <li v-for="(item, index) in searchList" :key="index">
52 {{ item.name }}:{{ item.value }} 101 {{ item.name }}:{{ item.value }}
53 <i class="el-icon-circle-close" @click="handelItem(item, index)"></i> 102 <i
103 class="el-icon-circle-close"
104 @click="handelItem(item, index)"
105 ></i>
54 </li> 106 </li>
55 </ul> 107 </ul>
56 <el-button class="clean-btn" type="text" v-if="searchList.length > 0" @click.native="hanldeCleanAll">清除全部 108 <el-button
109 class="clean-btn"
110 type="text"
111 v-if="searchList.length > 0"
112 @click.native="hanldeCleanAll"
113 >清除全部
57 </el-button> 114 </el-button>
58 </el-row> 115 </el-row>
59 </el-form> 116 </el-form>
60 </div> 117 </div>
61 <!-- 表格 --> 118 <!-- 表格 -->
62 <div class="from-clues-content"> 119 <div class="from-clues-content">
63 <lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort" 120 <lb-table
64 :current-page.sync="pageData.currentPage" :heightNum="295" :total="tableData.total" 121 :page-size="pageData.size"
65 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 122 class="loadingtext"
66 :data="tableData.data"> 123 @sort-change="handleSort"
124 :current-page.sync="pageData.currentPage"
125 :heightNum="295"
126 :total="tableData.total"
127 @size-change="handleSizeChange"
128 @p-current-change="handleCurrentChange"
129 :column="tableData.columns"
130 :data="tableData.data"
131 >
67 </lb-table> 132 </lb-table>
68 </div> 133 </div>
69 <searchBox v-model="isSearch" @getSearch="getSearch" /> 134 <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
70 </div> 135 </div>
71 </template> 136 </template>
72 <script> 137 <script>
73 import { mapGetters } from 'vuex' 138 import { mapGetters } from "vuex";
74 import searchMin from "../components/mixin/index" 139 import searchMin from "../components/mixin/index";
75 import table from "@/utils/mixin/table" 140 import table from "@/utils/mixin/table";
76 import { datas, sendThis } from "./ybxdata" 141 import { datas, sendThis } from "./ybxdata";
77 import { searchTaskDone } from "@/api/ywbl" 142 import { searchTaskDone } from "@/api/ywbl";
78 import searchBox from '../components/search.vue' 143 import searchBox from "../components/search.vue";
79 export default { 144 export default {
80 name: "ybx", 145 name: "ybx",
81 components: { searchBox }, 146 components: { searchBox },
82 mixins: [table, searchMin], 147 mixins: [table, searchMin],
83 mounted () { 148 mounted() {
149 window["getBpageList"] = () => {
150 this.queryClick();
151 };
84 sendThis(this); 152 sendThis(this);
85 }, 153 },
86 computed: { 154 computed: {
87 ...mapGetters(['dictData']) 155 ...mapGetters(["dictData"]),
88 }, 156 },
89 data () { 157 data() {
90 return { 158 return {
91 queryForm: { 159 queryForm: {
92 ywly: "", 160 ywly: "",
...@@ -95,10 +163,10 @@ export default { ...@@ -95,10 +163,10 @@ export default {
95 ywh: "", 163 ywh: "",
96 }, 164 },
97 searchForm: { 165 searchForm: {
98 ywlymc: '', 166 ywlymc: "",
99 qllxmc: '', 167 qllxmc: "",
100 djlxmc: '', 168 djlxmc: "",
101 ywh: '' 169 ywh: "",
102 }, 170 },
103 tableData: { 171 tableData: {
104 total: 0, 172 total: 0,
...@@ -109,35 +177,46 @@ export default { ...@@ -109,35 +177,46 @@ export default {
109 }, 177 },
110 methods: { 178 methods: {
111 // 列表渲染接口 179 // 列表渲染接口
112 queryClick () { 180 queryClick() {
113 this.$startLoading() 181 this.$startLoading();
114 this.searchForm.ywh = this.queryForm.ywh 182 this.searchForm.ywh = this.queryForm.ywh;
115 this.iterationData() 183 this.iterationData();
116 searchTaskDone({ ...this.queryForm,...this.otherForm, ...this.pageData }).then(res => { 184 searchTaskDone({
117 this.$endLoading() 185 ...this.queryForm,
186 ...this.otherForm,
187 ...this.pageData,
188 }).then((res) => {
189 this.$endLoading();
118 if (res.code === 200) { 190 if (res.code === 200) {
119 let { total, records } = res.result 191 let { total, records } = res.result;
120 records.forEach(item => { 192 records.forEach((item) => {
121 item.qlrmc = item.qlrmc.join(',') 193 item.qlrmc = item.qlrmc.join(",");
122 item.ywh = item.ywh.join(',') 194 item.ywh = item.ywh.join(",");
123 item.zl = item.zl.join(',') 195 item.zl = item.zl.join(",");
124 item.outstepdate = item.outstepdate[0] 196 item.outstepdate = item.outstepdate[0];
125 }) 197 });
126 this.tableData.total = total ? total : 0 198 this.tableData.total = total ? total : 0;
127 this.tableData.data = records ? records : [] 199 this.tableData.data = records ? records : [];
128 } 200 }
129 }) 201 });
130 }, 202 },
131 handleSort (val) { 203 handleSort(val) {
132 this.queryForm.sortField = val.prop 204 this.queryForm.sortField = val.prop;
133 this.queryForm.sortOrder = val.order == "ascending" ? 'asc' : 'desc' 205 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
134 this.queryClick() 206 this.queryClick();
135 }, 207 },
136 ywhClick (item) { 208 ywhClick(item) {
137 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); 209 const { href } = this.$router.resolve(
138 window.open(href, '_blank'); 210 "/workFrameView?bsmSlsq=" +
139 } 211 item.bsmSlsq +
140 } 212 "&bestepid=" +
213 item.bestepid +
214 "&bsmBusiness=" +
215 "&viewtype=1"
216 );
217 window.open(href, `urlname${item.bsmSlsq}`);
218 },
219 },
141 }; 220 };
142 </script> 221 </script>
143 <style scoped lang="scss"> 222 <style scoped lang="scss">
......
...@@ -4,33 +4,53 @@ ...@@ -4,33 +4,53 @@
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="queryForm" ref="queryForm" label-width="120px"> 5 <el-form :model="queryForm" ref="queryForm" label-width="120px">
6 <el-row> 6 <el-row>
7 <el-col :span="8"> 7 <el-col :span="10">
8 <el-form-item label="不动产单元号"> 8 <el-form-item label="不动产单元号">
9 <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width300px"> 9 <el-input
10 placeholder="请输入不动产单元号"
11 v-model="queryForm.bdcdyh"
12 clearable
13 class="width300px"
14 >
10 </el-input> 15 </el-input>
11 </el-form-item> 16 </el-form-item>
12 </el-col> 17 </el-col>
13 <el-col :span="8"> 18 <el-col :span="10">
14 <el-form-item label="不动产权证号"> 19 <el-form-item label="不动产权证号">
15 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width300px"> 20 <el-input
21 placeholder="请输入不动产权证号"
22 v-model="queryForm.bdcqzh"
23 clearable
24 class="width300px"
25 >
16 </el-input> 26 </el-input>
17 </el-form-item> 27 </el-form-item>
18 </el-col> 28 </el-col>
19 <el-col :span="8"> 29 </el-row>
30 <el-row>
31 <el-col :span="10">
20 <el-form-item label="权利人"> 32 <el-form-item label="权利人">
21 <el-input placeholder="请输入不动产单元号" v-model="queryForm.zl" clearable class="width300px"> 33 <el-input
34 placeholder="请输入权利人"
35 v-model="queryForm.zl"
36 clearable
37 class="width300px"
38 >
22 </el-input> 39 </el-input>
23 </el-form-item> 40 </el-form-item>
24 </el-col> 41 </el-col>
25 </el-row> 42 <el-col :span="10">
26 <el-row>
27 <el-col :span="8">
28 <el-form-item label="坐落"> 43 <el-form-item label="坐落">
29 <el-input placeholder="请输入不动产单元号" v-model="queryForm.zl" clearable class="width300px"> 44 <el-input
45 placeholder="请输入坐落"
46 v-model="queryForm.zl"
47 clearable
48 class="width300px"
49 >
30 </el-input> 50 </el-input>
31 </el-form-item> 51 </el-form-item>
32 </el-col> 52 </el-col>
33 <el-col :span="2" class="btnColRight"> 53 <el-col :span="4" class="btnColRight">
34 <el-form-item> 54 <el-form-item>
35 <el-button type="primary" @click="queryClick">查询</el-button> 55 <el-button type="primary" @click="queryClick">查询</el-button>
36 </el-form-item> 56 </el-form-item>
...@@ -40,10 +60,19 @@ ...@@ -40,10 +60,19 @@
40 </div> 60 </div>
41 <!-- 表格 --> 61 <!-- 表格 -->
42 <div class="from-clues-content"> 62 <div class="from-clues-content">
43 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :heightNum="400" 63 <lb-table
44 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" 64 ref="table"
45 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns" 65 @row-click="handleRowClick"
46 :data="tableData.data"> 66 :page-size="pageData.pageSize"
67 :heightNum="400"
68 :current-page.sync="pageData.currentPage"
69 :total="tableData.total"
70 @size-change="handleSizeChange"
71 @p-current-change="handleCurrentChange"
72 @selection-change="handleSelectionChange"
73 :column="tableData.columns"
74 :data="tableData.data"
75 >
47 </lb-table> 76 </lb-table>
48 </div> 77 </div>
49 <div class="submit_button"> 78 <div class="submit_button">
...@@ -63,9 +92,9 @@ export default { ...@@ -63,9 +92,9 @@ export default {
63 mixins: [table, jump], 92 mixins: [table, jump],
64 props: { 93 props: {
65 isJump: { type: Boolean, default: false }, 94 isJump: { type: Boolean, default: false },
66 sqywInfo: { type: Object, default: () => { } }, 95 sqywInfo: { type: Object, default: () => {} },
67 }, 96 },
68 data () { 97 data() {
69 return { 98 return {
70 queryForm: defaultParameters.defaultParameters(), 99 queryForm: defaultParameters.defaultParameters(),
71 tableData: { 100 tableData: {
...@@ -76,11 +105,11 @@ export default { ...@@ -76,11 +105,11 @@ export default {
76 bdcdysz: [], 105 bdcdysz: [],
77 }; 106 };
78 }, 107 },
79 mounted () { 108 mounted() {
80 sendThis(this); 109 sendThis(this);
81 }, 110 },
82 methods: { 111 methods: {
83 queryClick () { 112 queryClick() {
84 this.queryForm.sqywbm = this.sqywInfo.djywbm; 113 this.queryForm.sqywbm = this.sqywInfo.djywbm;
85 selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 114 selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
86 if (res.code === 200) { 115 if (res.code === 200) {
...@@ -90,7 +119,7 @@ export default { ...@@ -90,7 +119,7 @@ export default {
90 } 119 }
91 }); 120 });
92 }, 121 },
93 submitForm () { 122 submitForm() {
94 if (this.bdcdysz.length == 0) { 123 if (this.bdcdysz.length == 0) {
95 this.$message.error("请至少选择一条数据"); 124 this.$message.error("请至少选择一条数据");
96 return; 125 return;
...@@ -117,14 +146,14 @@ export default { ...@@ -117,14 +146,14 @@ export default {
117 } 146 }
118 }); 147 });
119 }, 148 },
120 handleSelectionChange (val) { 149 handleSelectionChange(val) {
121 val.forEach((item, index) => { 150 val.forEach((item, index) => {
122 item.bsmSsql = item.bsmQlxx; 151 item.bsmSsql = item.bsmQlxx;
123 item.ybdcqzsh = item.bdcqzh; 152 item.ybdcqzsh = item.bdcqzh;
124 }); 153 });
125 this.bdcdysz = val; 154 this.bdcdysz = val;
126 }, 155 },
127 openBook (row) { 156 openBook(row) {
128 var param = { 157 var param = {
129 bdcdyid: row.bdcdyid, 158 bdcdyid: row.bdcdyid,
130 qllx: row.qllx, 159 qllx: row.qllx,
......
...@@ -70,11 +70,11 @@ class data extends filter { ...@@ -70,11 +70,11 @@ class data extends filter {
70 label: "建筑物名称", 70 label: "建筑物名称",
71 }, 71 },
72 { 72 {
73 label: "权利性质", 73 label: "土地/房屋性质",
74 render: (h, scope) => { 74 render: (h, scope) => {
75 return ( 75 return (
76 <div> 76 <div>
77 {(scope.row.showQlxz) + (' / ') + (scope.row.fwxzbsm)} 77 {(scope.row.showQlxz) + (' / ') + (scope.row.fwxzmc)}
78 </div> 78 </div>
79 ) 79 )
80 } 80 }
...@@ -90,7 +90,7 @@ class data extends filter { ...@@ -90,7 +90,7 @@ class data extends filter {
90 } 90 }
91 }, 91 },
92 { 92 {
93 label: "用途", 93 label: "土地/房屋用途",
94 render: (h, scope) => { 94 render: (h, scope) => {
95 return ( 95 return (
96 <div> 96 <div>
......
...@@ -121,7 +121,8 @@ export default { ...@@ -121,7 +121,8 @@ export default {
121 }, 121 },
122 openDialog (item) { 122 openDialog (item) {
123 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3') 123 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
124 window.open(href, '_blank'); 124 // window.open(href, '_blank');
125 window.open(href, `urlname${item.bsmSlsq}`);
125 } 126 }
126 } 127 }
127 } 128 }
......