dc3bba54 by 夏齐

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/workflow/flowform.js
2 parents a3c30052 a869ad39
...@@ -5,4 +5,4 @@ NODE_ENV=development ...@@ -5,4 +5,4 @@ NODE_ENV=development
5 VUE_APP_BASE_API = '/bdcdj' 5 VUE_APP_BASE_API = '/bdcdj'
6 6
7 # 开发环境 7 # 开发环境
8 VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018' 8 VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'
......
...@@ -3,14 +3,14 @@ import request from '@/utils/request' ...@@ -3,14 +3,14 @@ import request from '@/utils/request'
3 // 初始化内容 3 // 初始化内容
4 export function Init(data) { 4 export function Init(data) {
5 let apiUrl = ""; 5 let apiUrl = "";
6 switch (data.get("sqywbm")) { 6 switch (data.get("djlx")) {
7 case "B39300": 7 case "300":
8 apiUrl = "/ywbl/cfdj/xfInit"; 8 apiUrl = "/ywbl/cfdj/xfInit";
9 break; 9 break;
10 case "B39400": 10 case "400":
11 apiUrl = "/ywbl/cfdj/jfInit"; 11 apiUrl = "/ywbl/cfdj/jfInit";
12 break; 12 break;
13 case "B39800": 13 case "800":
14 apiUrl = "/ywbl/cfdj/cfInit"; 14 apiUrl = "/ywbl/cfdj/cfInit";
15 break; 15 break;
16 } 16 }
...@@ -20,11 +20,22 @@ export function Init(data) { ...@@ -20,11 +20,22 @@ export function Init(data) {
20 data 20 data
21 }) 21 })
22 } 22 }
23 23 //批量初始化
24 //批量查封 24 export function BatchInit(data) {
25 export function cfBatchInit (data) { 25 let apiUrl = "";
26 switch (data.get("djlx")) {
27 case "300":
28 apiUrl = "/ywbl/cfdj/xfBatchInit";
29 break;
30 case "400":
31 apiUrl = "/ywbl/cfdj/jfBatchInit";
32 break;
33 case "800":
34 apiUrl = "/ywbl/cfdj/cfBatchInit";
35 break;
36 }
26 return request({ 37 return request({
27 url: '/ywbl/cfdj/cfBatchInit', 38 url: apiUrl,
28 method: 'post', 39 method: 'post',
29 data 40 data
30 }) 41 })
...@@ -38,3 +49,12 @@ export function saveData (data) { ...@@ -38,3 +49,12 @@ export function saveData (data) {
38 data 49 data
39 }) 50 })
40 } 51 }
52
53 // 批量数据保存
54 export function batchSaveData (data) {
55 return request({
56 url: '/ywbl/cfdj/batchSaveData',
57 method: 'post',
58 data
59 })
60 }
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <!-- 界面后期调整开发,报表开发,目前先放一张图片 -->
3 <el-form :model="ruleForm" label-width="120px"> 4 <el-form :model="ruleForm" label-width="120px">
4 <el-row> 5 <el-row>
5 <el-col :span="6"> 6 <el-col :span="6">
6 <el-form-item label="查询时间:"> 7 <img :src="imgUrl" alt="" srcset="" />
7 <!-- <el-input disabled v-model="ruleForm.cxlx"></el-input> --> 8 <!-- <el-form-item label="查询时间:">
8 {{ ruleForm.cxsj }} 9 {{ ruleForm.cxsj }}
9 </el-form-item> 10 </el-form-item>
10 </el-col> 11 </el-col>
11 <el-col :span="8"> 12 <el-col :span="8">
12 <el-form-item label="不动产单元号:"> 13 <el-form-item label="不动产单元号:">
13 {{ ruleForm.bdcdyh }} 14 {{ ruleForm.bdcdyh }}
14 </el-form-item> 15 </el-form-item> -->
15 </el-col> 16 </el-col>
16 </el-row> 17 </el-row>
17 <el-row> 18 <el-row>
18 <el-col :span="24">
19 <table class="table1">
20 <tr>
21 <td>1</td>
22 <td>2</td>
23 <td>3</td>
24 <td>4</td>
25 <td>5</td>
26 <td>6</td>
27 <td>7</td>
28 <td>8</td>
29 <td>9</td>
30 <td>10</td>
31 <td>11</td>
32
33 </tr>
34 </table>
35 </el-col>
36 </el-row> 19 </el-row>
37 </el-form> 20 </el-form>
38 </div> 21 </div>
...@@ -40,6 +23,7 @@ ...@@ -40,6 +23,7 @@
40 23
41 <script> 24 <script>
42 import { getJtfcInfo } from "@/api/sqcxjl"; 25 import { getJtfcInfo } from "@/api/sqcxjl";
26 import imgPath from "./打印登记薄.png" //先导入
43 27
44 export default { 28 export default {
45 components: {}, 29 components: {},
...@@ -56,6 +40,7 @@ export default { ...@@ -56,6 +40,7 @@ export default {
56 cxsj: "", 40 cxsj: "",
57 bdcdyh: "", 41 bdcdyh: "",
58 }, 42 },
43 imgUrl:imgPath,
59 }; 44 };
60 }, 45 },
61 46
......
...@@ -98,10 +98,10 @@ export default { ...@@ -98,10 +98,10 @@ export default {
98 // var sqcxBsm = scope.row.bsmSqcx; 98 // var sqcxBsm = scope.row.bsmSqcx;
99 this.$popup({ 99 this.$popup({
100 title: "打印登记薄", 100 title: "打印登记薄",
101 width: "85%", 101 width: "65%",
102 btnShow: true, 102 btnShow: true,
103 editItem: "sqcx/dydjb/components/dydjbInfo", // 弹窗内容 103 editItem: "sqcx/dydjb/components/dydjbInfo", // 弹窗内容
104 height: "700px", 104 height: "800px",
105 formData: { 105 formData: {
106 sqcxdata: scope.row, 106 sqcxdata: scope.row,
107 }, 107 },
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <el-button @click="resetClick()">重置</el-button> 30 <el-button @click="resetClick()">重置</el-button>
31 </div> 31 </div>
32 <b class="title">查询结果</b> 32 <b class="title">查询结果</b>
33 <p>查询编号:202200409</p> 33 <!-- <p>查询编号:{{cxbh}}</p> -->
34 <lb-table :column="searchData.columns" border :data="searchData.data" :maxHeight="200" heightNumSetting 34 <lb-table :column="searchData.columns" border :data="searchData.data" :maxHeight="200" heightNumSetting
35 :pagination="false"> 35 :pagination="false">
36 </lb-table> 36 </lb-table>
......
...@@ -23,7 +23,7 @@ class data extends filter { ...@@ -23,7 +23,7 @@ class data extends filter {
23 label: '登记时间', 23 label: '登记时间',
24 }, 24 },
25 { 25 {
26 prop: 'hth', 26 prop: 'wqhth',
27 label: '合同号', 27 label: '合同号',
28 }, 28 },
29 { 29 {
...@@ -39,11 +39,11 @@ class data extends filter { ...@@ -39,11 +39,11 @@ class data extends filter {
39 label: '共有方式', 39 label: '共有方式',
40 }, 40 },
41 { 41 {
42 prop: 'qlr', 42 prop: 'qlrmc',
43 label: '权利人', 43 label: '权利人',
44 }, 44 },
45 { 45 {
46 prop: 'zjh', 46 prop: 'zjhm',
47 label: '证件号', 47 label: '证件号',
48 }, 48 },
49 { 49 {
...@@ -51,7 +51,7 @@ class data extends filter { ...@@ -51,7 +51,7 @@ class data extends filter {
51 label: '房地坐落', 51 label: '房地坐落',
52 }, 52 },
53 { 53 {
54 prop: 'jzmj', 54 prop: 'fwmj',
55 label: '建筑面积(㎡)', 55 label: '建筑面积(㎡)',
56 }, 56 },
57 { 57 {
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 </el-row> 73 </el-row>
74 <el-row> 74 <el-row>
75 <el-col> 75 <el-col>
76 <p>查询编号:202200409</p> 76 <p>查询编号:{{cxbh}}</p>
77 </el-col> 77 </el-col>
78 </el-row> 78 </el-row>
79 <el-row> 79 <el-row>
...@@ -145,6 +145,7 @@ export default { ...@@ -145,6 +145,7 @@ export default {
145 this.sqrData.data = res.result.sqxx; 145 this.sqrData.data = res.result.sqxx;
146 this.qlrData.data = res.result.qlrxx; 146 this.qlrData.data = res.result.qlrxx;
147 this.cxjgData.data = res.result.djSqcxCxjgDOList; 147 this.cxjgData.data = res.result.djSqcxCxjgDOList;
148 this.cxbh=res.result.djSqcxDO.cxbh;
148 149
149 } 150 }
150 }) 151 })
......
...@@ -8,11 +8,23 @@ class data extends filter { ...@@ -8,11 +8,23 @@ class data extends filter {
8 constructor() { 8 constructor() {
9 super() 9 super()
10 } 10 }
11 cxjgcolumns () { 11 cxjgcolumns() {
12 return [ 12 return [
13 { 13 {
14 prop: 'qszt', 14 prop: 'qszt',
15 label: '权属状态', 15 label: '权属状态',
16 render: (h, scope) => {
17 switch (scope.row.qszt) {
18 case '0':
19 return <div>临时</div>
20 case '1':
21 return <div>现势</div>
22 case '2':
23 return <div>历史</div>
24 case '3':
25 return <div>终止</div>
26 }
27 }
16 }, 28 },
17 { 29 {
18 prop: 'bdcqzh', 30 prop: 'bdcqzh',
...@@ -23,7 +35,7 @@ class data extends filter { ...@@ -23,7 +35,7 @@ class data extends filter {
23 label: '登记时间', 35 label: '登记时间',
24 }, 36 },
25 { 37 {
26 prop: 'hth', 38 prop: 'wqhth',
27 label: '合同号', 39 label: '合同号',
28 }, 40 },
29 { 41 {
...@@ -39,19 +51,19 @@ class data extends filter { ...@@ -39,19 +51,19 @@ class data extends filter {
39 label: '共有方式', 51 label: '共有方式',
40 }, 52 },
41 { 53 {
42 prop: 'qlr', 54 prop: 'qlrmc',
43 label: '权利人', 55 label: '权利人',
44 }, 56 },
45 { 57 {
46 prop: 'zjh', 58 prop: 'zjhm',
47 label: '证件号', 59 label: '证件号',
48 }, 60 },
49 { 61 {
50 prop: 'fdzl', 62 prop: 'zl',
51 label: '房地坐落', 63 label: '房地坐落',
52 }, 64 },
53 { 65 {
54 prop: 'jzmj', 66 prop: 'fwmj',
55 label: '建筑面积(㎡)', 67 label: '建筑面积(㎡)',
56 }, 68 },
57 { 69 {
...@@ -74,7 +86,7 @@ class data extends filter { ...@@ -74,7 +86,7 @@ class data extends filter {
74 } 86 }
75 ] 87 ]
76 } 88 }
77 sqrcolumns () { 89 sqrcolumns() {
78 return [ 90 return [
79 { 91 {
80 prop: 'sqrxm', 92 prop: 'sqrxm',
...@@ -95,7 +107,7 @@ class data extends filter { ...@@ -95,7 +107,7 @@ class data extends filter {
95 ] 107 ]
96 } 108 }
97 109
98 qlrcolumns () { 110 qlrcolumns() {
99 return [ 111 return [
100 { 112 {
101 prop: 'sqrxm', 113 prop: 'sqrxm',
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList"> 3 <lb-table :column="column" border :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList">
4 </lb-table> 4 </lb-table>
5 <addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" /> 5 <addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" />
6 </div> 6 </div>
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
39 width: '50', 39 width: '50',
40 renderHeader: (h, scope) => { 40 renderHeader: (h, scope) => {
41 return <div> { 41 return <div> {
42 this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i> 42 this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
43 } 43 }
44 </div> 44 </div>
45 }, 45 },
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
48 <div> 48 <div>
49 { 49 {
50 this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> : 50 this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> :
51 <i class="el-icon-minus pointer" onClick={() => { this.handleMinus(scope.$index, scope.row) }}></i> 51 <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
52 } 52 }
53 </div> 53 </div>
54 ) 54 )
...@@ -86,10 +86,10 @@ export default { ...@@ -86,10 +86,10 @@ export default {
86 this.$route.query.viewtype == 1 ? <el-button 86 this.$route.query.viewtype == 1 ? <el-button
87 icon="el-icon-view" 87 icon="el-icon-view"
88 type="text" 88 type="text"
89 onClick={() => { this.handleView(scope.$index, scope.row) }}>查看</el-button> : <el-button 89 onClick={() => { this.queryViewClick(scope.$index, scope.row) }}>查看</el-button> : <el-button
90 icon="el-icon-edit-outline" 90 icon="el-icon-edit-outline"
91 type="text" 91 type="text"
92 onClick={() => { this.handleEdit(scope.$index, scope.row) }}>编辑</el-button> 92 onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
93 } 93 }
94 </div> 94 </div>
95 ) 95 )
...@@ -142,24 +142,29 @@ export default { ...@@ -142,24 +142,29 @@ export default {
142 this.key++ 142 this.key++
143 this.$emit('upDateQlrxxList', this.tableDataList) 143 this.$emit('upDateQlrxxList', this.tableDataList)
144 }, 144 },
145 // 添加 145
146 handleAdd () { 146 // 新增
147 addClick () {
147 this.dialog = true 148 this.dialog = true
148 }, 149 },
149 // 减 150
150 handleMinus (index, row) { 151 // 删除
152 deleClick (index, row) {
151 this.tableData.splice(index, 1) 153 this.tableData.splice(index, 1)
152 }, 154 },
155
153 // 身份证读取 156 // 身份证读取
154 readClick () { }, 157 readClick () { },
158
155 // 修改 159 // 修改
156 handleEdit (index, row) { 160 editClick (index, row) {
157 console.log(row, 'rowrowrowrowrow'); 161 console.log(row, 'rowrowrowrowrow');
158 this.dataIndex = index 162 this.dataIndex = index
159 this.dialog = true 163 this.dialog = true
160 this.details = row 164 this.details = row
161 }, 165 },
162 handleView () { 166
167 queryViewClick () {
163 this.dialog = true 168 this.dialog = true
164 } 169 }
165 } 170 }
......
...@@ -59,14 +59,6 @@ export default { ...@@ -59,14 +59,6 @@ export default {
59 label: "权利人" 59 label: "权利人"
60 }, 60 },
61 { 61 {
62 prop: "ywrmc",
63 label: "义务人"
64 },
65 {
66 prop: "qlxz",
67 label: "权利性质"
68 },
69 {
70 prop: "ytmc", 62 prop: "ytmc",
71 label: "用途" 63 label: "用途"
72 }, 64 },
......
...@@ -44,7 +44,7 @@ export function getForm(tabName, djywbm) { ...@@ -44,7 +44,7 @@ export function getForm(tabName, djywbm) {
44 case "cfdjxx": 44 case "cfdjxx":
45 form = require("@/views/registerBook/cfdj.vue"); 45 form = require("@/views/registerBook/cfdj.vue");
46 break; 46 break;
47 case "qlxx": 47 case "jsydsyqQlxx":
48 form = require("@/views/registerBook/jsydsyq.vue"); 48 form = require("@/views/registerBook/jsydsyq.vue");
49 break; 49 break;
50 case "fdcq2Qlxx": 50 case "fdcq2Qlxx":
......
...@@ -383,7 +383,16 @@ export default { ...@@ -383,7 +383,16 @@ export default {
383 type: "warning", //提示类型 success/info/warning/error 383 type: "warning", //提示类型 success/info/warning/error
384 }).then(function () { 384 }).then(function () {
385 record(formdata).then((res) => { 385 record(formdata).then((res) => {
386 if (res.code === 200 || res.code === 2002) { 386 if (res.code === 200) {
387 if(res.result.length===1){
388 res.result[0].state? that.$alert("登簿成功!"): that.$alert(res.result[0].msg);;
389 }
390 else{
391 that.$alert('<div>'+res.result[0].ywh+','+res.result[0].msg+'</div>', '登簿明细', {
392 dangerouslyUseHTMLString: true
393 });
394 }
395 }else{
387 that.$alert(res.message); 396 that.$alert(res.message);
388 } 397 }
389 }); 398 });
......
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
132 </template> 132 </template>
133 <script> 133 <script>
134 import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable"; 134 import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
135 import { cfBatchInit, saveData } from "@/api/cfdjFlow.js"; 135 import { BatchInit, batchSaveData } from "@/api/cfdjFlow.js";
136 import { mapGetters } from "vuex"; 136 import { mapGetters } from "vuex";
137 export default { 137 export default {
138 data () { 138 data () {
...@@ -148,7 +148,15 @@ export default { ...@@ -148,7 +148,15 @@ export default {
148 }; 148 };
149 }, 149 },
150 created () { 150 created () {
151 this.list(); 151 this.propsParam = this.$attrs;
152 var formdata = new FormData();
153 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
154 formdata.append("djlx", this.propsParam.djlx);
155 BatchInit(formdata).then((res) => {
156 if (res.code === 200 && res.result) {
157 this.ruleForm = res.result
158 }
159 });
152 }, 160 },
153 watch: { 161 watch: {
154 162
...@@ -169,18 +177,10 @@ export default { ...@@ -169,18 +177,10 @@ export default {
169 }, 177 },
170 178
171 methods: { 179 methods: {
172 list () {
173 var formdata = new FormData();
174 formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
175 cfBatchInit(formdata).then((res) => {
176 if (res.code === 200 && res.result) {
177 this.ruleForm = res.result
178 }
179 });
180 },
181 onSubmit () { 180 onSubmit () {
182 saveData(this.ruleForm).then((res) => { 181 this.ruleForm.bsmSlsq = this.$route.query.bsmSlsq;
183 if (res.code === 200 && res.result) { 182 batchSaveData(this.ruleForm).then((res) => {
183 if (res.code === 200) {
184 this.$message.success('保存成功'); 184 this.$message.success('保存成功');
185 } 185 }
186 }); 186 });
......
...@@ -63,37 +63,37 @@ ...@@ -63,37 +63,37 @@
63 </el-form-item> 63 </el-form-item>
64 </el-col> 64 </el-col>
65 <el-col :span="8"> 65 <el-col :span="8">
66 <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地面积:"> 66 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积:">
67 <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input> 67 <el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
68 </el-form-item> 68 </el-form-item>
69 </el-col> 69 </el-col>
70 </el-row> 70 </el-row>
71 <el-row :gutter="10"> 71 <el-row :gutter="10">
72 <el-col :span="8"> 72 <el-col :span="8">
73 <el-form-item :class="flag ? 'marginBot0' : ''" label="土地用途:"> 73 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途:">
74 <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input> 74 <el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
75 </el-form-item> 75 </el-form-item>
76 </el-col> 76 </el-col>
77 <el-col :span="16"> 77 <el-col :span="16">
78 <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落:"> 78 <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落:">
79 <el-input disabled v-model="ruleForm.zdjbxx.zl"></el-input> 79 <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
80 </el-form-item> 80 </el-form-item>
81 </el-col> 81 </el-col>
82 </el-row> 82 </el-row>
83 <el-row :gutter="10"> 83 <el-row :gutter="10">
84 <el-col :span="8"> 84 <el-col :span="8">
85 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人:" prop="qlxx.qlrmc"> 85 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人:" prop="qlxx.qlrmc">
86 <el-input disabled v-model="ruleForm.qlxx.ywrmc"></el-input> 86 <el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
87 </el-form-item> 87 </el-form-item>
88 </el-col> 88 </el-col>
89 <el-col :span="8"> 89 <el-col :span="8">
90 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号:"> 90 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号:">
91 <el-input disabled v-model="ruleForm.qlxx.ywrzjhm"></el-input> 91 <el-input disabled v-model="ruleForm.qlxx.qlrzjhm"></el-input>
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 <el-col :span="8"> 94 <el-col :span="8">
95 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类:"> 95 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类:">
96 <el-input disabled v-model="ruleForm.qlxx.ywrzjzl"></el-input> 96 <el-input disabled v-model="ruleForm.qlxx.qlrzjzl"></el-input>
97 </el-form-item> 97 </el-form-item>
98 </el-col> 98 </el-col>
99 </el-row> 99 </el-row>
...@@ -104,13 +104,13 @@ ...@@ -104,13 +104,13 @@
104 <el-row :gutter="10"> 104 <el-row :gutter="10">
105 <el-col :span="8"> 105 <el-col :span="8">
106 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:" prop="cfdj.cfjg"> 106 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关:" prop="cfdj.cfjg">
107 <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype"></el-input> 107 <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype || ableEdit"></el-input>
108 </el-form-item> 108 </el-form-item>
109 </el-col> 109 </el-col>
110 <el-col :span="8"> 110 <el-col :span="8">
111 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflx"> 111 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflx">
112 <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型:" 112 <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型:"
113 :disabled="$route.query.viewtype" @change="changeCflx"> 113 :disabled="$route.query.viewtype || ableEdit" @change="changeCflx">
114 <el-option v-for="item in dictData['A32']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 114 <el-option v-for="item in dictData['A32']" :key="item.dcode" :label="item.dname" :value="item.dcode">
115 </el-option> 115 </el-option>
116 </el-select> 116 </el-select>
...@@ -118,25 +118,25 @@ ...@@ -118,25 +118,25 @@
118 </el-col> 118 </el-col>
119 <el-col :span="8"> 119 <el-col :span="8">
120 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj"> 120 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件:" prop="cfdj.cfwj">
121 <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype"></el-input> 121 <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype || ableEdit"></el-input>
122 </el-form-item> 122 </el-form-item>
123 </el-col> 123 </el-col>
124 </el-row> 124 </el-row>
125 <el-row :gutter="10"> 125 <el-row :gutter="10">
126 <el-col :span="8"> 126 <el-col :span="8">
127 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号:" prop="cfdj.cfwh"> 127 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号:" prop="cfdj.cfwh">
128 <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype"></el-input> 128 <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype || ableEdit"></el-input>
129 </el-form-item> 129 </el-form-item>
130 </el-col> 130 </el-col>
131 <el-col :span="8"> 131 <el-col :span="8">
132 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间:" prop="cfdj.cfqssj"> 132 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间:" prop="cfdj.cfqssj">
133 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" :disabled="$route.query.viewtype" 133 <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" :disabled="$route.query.viewtype || ableEdit"
134 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker> 134 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
135 </el-form-item> 135 </el-form-item>
136 </el-col> 136 </el-col>
137 <el-col :span="8"> 137 <el-col :span="8">
138 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间:" prop="cfdj.cfjssj"> 138 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间:" prop="cfdj.cfjssj">
139 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" :disabled="$route.query.viewtype" 139 <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" :disabled="$route.query.viewtype || ableEdit"
140 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker> 140 type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
141 </el-form-item> 141 </el-form-item>
142 </el-col> 142 </el-col>
...@@ -144,26 +144,26 @@ ...@@ -144,26 +144,26 @@
144 <el-row :gutter="10"> 144 <el-row :gutter="10">
145 <el-col :span="24"> 145 <el-col :span="24">
146 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:" prop="cfdj.cffw"> 146 <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围:" prop="cfdj.cffw">
147 <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype"></el-input> 147 <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype || ableEdit"></el-input>
148 </el-form-item> 148 </el-form-item>
149 </el-col> 149 </el-col>
150 </el-row> 150 </el-row>
151 <el-row :gutter="10"> 151 <el-row :gutter="10">
152 <el-col :span="24"> 152 <el-col :span="24">
153 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记:" prop="cfdj.fj"> 153 <el-form-item :class="flag ? 'marginBot0' : ''" label="附记:" prop="cfdj.fj">
154 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype"></el-input> 154 <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype || ableEdit"></el-input>
155 </el-form-item> 155 </el-form-item>
156 </el-col> 156 </el-col>
157 </el-row> 157 </el-row>
158 <el-row :gutter="10"> 158 <el-row :gutter="10">
159 <el-col> 159 <el-col>
160 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdj.djyy"> 160 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="cfdj.djyy">
161 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype"></el-input> 161 <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype || ableEdit"></el-input>
162 </el-form-item> 162 </el-form-item>
163 </el-col> 163 </el-col>
164 </el-row> 164 </el-row>
165 </div> 165 </div>
166 <el-row class="btn" v-if="!$route.query.viewtype"> 166 <el-row class="btn" v-if="!$route.query.viewtype && !ableEdit">
167 <el-form-item :class="flag ? 'marginBot0' : ''"> 167 <el-form-item :class="flag ? 'marginBot0' : ''">
168 <el-button type="primary" @click="onSubmit">保存</el-button> 168 <el-button type="primary" @click="onSubmit">保存</el-button>
169 </el-form-item> 169 </el-form-item>
...@@ -185,12 +185,21 @@ export default { ...@@ -185,12 +185,21 @@ export default {
185 propsParam: {}, 185 propsParam: {},
186 //页面数据 186 //页面数据
187 ruleForm: {}, 187 ruleForm: {},
188 188 //是否可编辑
189 ableEdit: false
189 }; 190 };
190 }, 191 },
191 created () { 192 async created () {
192 this.propsParam = this.$attrs; 193 this.propsParam = this.$attrs;
193 this.list(this.propsParam.bsmSldy); 194 this.ableEdit = this.$parent.showBatch;
195 var formdata = new FormData();
196 formdata.append("bsmSldy", this.propsParam.bsmSldy);
197 formdata.append("djlx", this.propsParam.djlx);
198 Init(formdata).then((res) => {
199 if (res.code === 200 && res.result) {
200 this.ruleForm = res.result
201 }
202 });
194 }, 203 },
195 watch: { 204 watch: {
196 205
...@@ -211,16 +220,6 @@ export default { ...@@ -211,16 +220,6 @@ export default {
211 }, 220 },
212 221
213 methods: { 222 methods: {
214 list (bsmSldy) {
215 var formdata = new FormData();
216 formdata.append("bsmSldy", bsmSldy);
217 formdata.append("sqywbm", this.$route.query.sqywbm);
218 Init(formdata).then((res) => {
219 if (res.code === 200 && res.result) {
220 this.ruleForm = res.result
221 }
222 });
223 },
224 onSubmit () { 223 onSubmit () {
225 saveData(this.ruleForm).then((res) => { 224 saveData(this.ruleForm).then((res) => {
226 if (res.code === 200) { 225 if (res.code === 200) {
......
...@@ -50,7 +50,7 @@ class data extends filter { ...@@ -50,7 +50,7 @@ class data extends filter {
50 { 50 {
51 prop: "zbhj", 51 prop: "zbhj",
52 label: "在办环节", 52 label: "在办环节",
53 width: '70' 53 width: '80'
54 }, 54 },
55 { 55 {
56 label: '业务号', 56 label: '业务号',
......
...@@ -219,7 +219,7 @@ export default { ...@@ -219,7 +219,7 @@ export default {
219 methods: { 219 methods: {
220 // 更新权利人信息 220 // 更新权利人信息
221 upDateQlrxxList (val) { 221 upDateQlrxxList (val) {
222 this.ruleForm.qlrxx = _.cloneDeep(val) 222 this.ruleForm.qlrList = _.cloneDeep(val)
223 // this.$store.dispatch('slxx/setQlrxxNew', { 223 // this.$store.dispatch('slxx/setQlrxxNew', {
224 // qlrxx: this.ruleForm.qlrxx, 224 // qlrxx: this.ruleForm.qlrxx,
225 // fj: this.ruleForm.fj, 225 // fj: this.ruleForm.fj,
...@@ -227,24 +227,20 @@ export default { ...@@ -227,24 +227,20 @@ export default {
227 // djyy: this.ruleForm.djyy 227 // djyy: this.ruleForm.djyy
228 // }) 228 // })
229 }, 229 },
230 list (bsmSldy) {
231 var formdata = new FormData();
232 formdata.append("bsmSldy", bsmSldy);
233 Init(formdata).then((res) => {
234 if (res.code === 200 && res.result) {
235 this.ruleForm = {
236 ...res.result,
237 ...res.result.zdjbxxdatas,
238 ...res.result.qlxxdatas,
239 ...res.result.jsydsyqdatas,
240 };
241 }
242 });
243 },
244 onSubmit () { 230 onSubmit () {
245 saveData(this.ruleForm).then((res) => { 231 saveData(this.ruleForm).then((res) => {
246 if (res.code === 200 && res.result) { 232 if (res.code === 200) {
247 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas } 233 this.$message({
234 showClose: true,
235 message: "保存成功!",
236 type: "success",
237 });
238 } else {
239 this.$message({
240 showClose: true,
241 message: res.message,
242 type: "error",
243 });
248 } 244 }
249 }); 245 });
250 }, 246 },
......
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
184 formdata.append("djlx", this.propsParam.djlx); 184 formdata.append("djlx", this.propsParam.djlx);
185 Init(formdata).then((res) => { 185 Init(formdata).then((res) => {
186 if (res.code === 200 && res.result) { 186 if (res.code === 200 && res.result) {
187 this.ruleForm = res.result; 187 this.ruleForm = res.result;
188 } 188 }
189 }); 189 });
190 }, 190 },
...@@ -196,32 +196,7 @@ export default { ...@@ -196,32 +196,7 @@ export default {
196 return { 196 return {
197 disabled: true, 197 disabled: true,
198 czrOptions: [], 198 czrOptions: [],
199 ruleForm: { 199 ruleForm: {},
200 ywh: "",
201 slry: "",
202 slsj: "",
203 qllx: "",
204 djlx: "",
205 djqx: "",
206 zddm: "",
207 bdcdyh: "",
208 qlxzmc: "",
209 qlrxx: [],
210 zdmj: "",
211 zl: "",
212 tdyt: "",
213 qlsdfs: "",
214 qdjg: "",
215 tdsyqx: "",
216 syqqzsj: "",
217 fj: "",
218 djyy: "",
219 gyfs: "1",
220 // 是否分别持证
221 sffbcz: "",
222 // 持证人
223 czr: "",
224 },
225 //传递参数 200 //传递参数
226 propsParam: {}, 201 propsParam: {},
227 rules: {}, 202 rules: {},
...@@ -231,29 +206,25 @@ export default { ...@@ -231,29 +206,25 @@ export default {
231 // 更新权利人信息 206 // 更新权利人信息
232 upDateQlrxxList (val) { 207 upDateQlrxxList (val) {
233 this.ruleForm.qlrList = _.cloneDeep(val); 208 this.ruleForm.qlrList = _.cloneDeep(val);
234 }, // 更新权利人信息 209 },
210 // 更新义务人信息
235 upDateYwrxxList (val) { 211 upDateYwrxxList (val) {
236 this.ruleForm.ywrList = _.cloneDeep(val); 212 this.ruleForm.ywrList = _.cloneDeep(val);
237 }, 213 },
238 list(bsmSldy) {
239 var formdata = new FormData();
240 formdata.append("bsmSldy", bsmSldy);
241 Init(formdata).then((res) => {
242 if (res.code === 200 && res.result) {
243 this.ruleForm = {
244 ...res.result,
245 ...res.result.zdjbxxdatas,
246 ...res.result.qlxxdatas,
247 ...res.result.jsydsyqdatas,
248 };
249 }
250 });
251 },
252 onSubmit() { 214 onSubmit() {
253 saveData(this.ruleForm).then((res) => { 215 saveData(this.ruleForm).then((res) => {
254 if (res.code === 200 && res.result) { 216 if (res.code === 200) {
255 console.log(res); 217 this.$message({
256 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas } 218 showClose: true,
219 message: "保存成功!",
220 type: "success",
221 });
222 } else {
223 this.$message({
224 showClose: true,
225 message: res.message,
226 type: "error",
227 });
257 } 228 }
258 }); 229 });
259 }, 230 },
......
...@@ -58,7 +58,7 @@ import { datas, sendThis } from "../javascript/cfdj.js"; ...@@ -58,7 +58,7 @@ import { datas, sendThis } from "../javascript/cfdj.js";
58 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 58 import { defaultParameters } from "../javascript/publicDefaultPar.js";
59 import table from "@/utils/mixin/table"; 59 import table from "@/utils/mixin/table";
60 import jump from "../components/mixin/jump"; 60 import jump from "../components/mixin/jump";
61 import { selectCfdj, startBusinessFlow } from "@/api/ywbl.js"; 61 import { selectCfdj, startBusinessFlow ,choiceBdcdy} from "@/api/ywbl.js";
62 export default { 62 export default {
63 props: { 63 props: {
64 isJump: { type: Boolean, default: false }, 64 isJump: { type: Boolean, default: false },
...@@ -102,28 +102,43 @@ export default { ...@@ -102,28 +102,43 @@ export default {
102 return; 102 return;
103 } 103 }
104 this.saveloding = true; 104 this.saveloding = true;
105 startBusinessFlow({ 105 if (!this.isJump) {
106 bsmSqyw: Cookies.get("bsmSqyw"), 106 startBusinessFlow({
107 bdcdysz: this.bdcdysz, 107 bsmSqyw: Cookies.get("bsmSqyw"),
108 djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '', 108 bdcdysz: this.bdcdysz,
109 djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '', 109 djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
110 }).then((res) => { 110 djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
111 this.saveloding = false; 111 }).then((res) => {
112 if (res.code == 200) { 112 this.saveloding = false;
113 this.$message({ 113 if (res.code == 200) {
114 showClose: true, 114 this.$message({
115 message: '发起申请成功', 115 showClose: true,
116 type: 'success' 116 message: '发起申请成功',
117 }) 117 type: 'success'
118 if (!this.isJump) { 118 })
119 this.jump(res.result, this.djywbm) 119 this.jump(res.result, this.djywbm)
120 } else { 120 } else {
121 this.$message.error(res.message);
122 }
123 })
124 } else {
125 choiceBdcdy({
126 bsmSlsq: this.$route.query.bsmSlsq,
127 bdcdysz: this.bdcdysz
128 }).then(res => {
129 this.saveloding = false;
130 if (res.code == 200) {
131 this.$message({
132 showClose: true,
133 message: '发起申请成功',
134 type: 'success'
135 })
121 this.$emit('updateDialog', true) 136 this.$emit('updateDialog', true)
137 } else {
138 this.$message.error(res.message);
122 } 139 }
123 } else { 140 })
124 this.$message.error(res.message); 141 }
125 }
126 });
127 }, 142 },
128 handleSelectionChange (val) { 143 handleSelectionChange (val) {
129 val.forEach((item, index) => { 144 val.forEach((item, index) => {
......
...@@ -6,27 +6,52 @@ ...@@ -6,27 +6,52 @@
6 <el-row> 6 <el-row>
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.qllx" filterable clearable placeholder="请选择权利类型"> 9 <el-select
10 <el-option v-for="item in dictData['权利类型']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 10 v-model="queryForm.qllx"
11 filterable
12 clearable
13 placeholder="请选择权利类型"
14 >
15 <el-option
16 v-for="item in dictData['A8']"
17 :key="item.dcode"
18 :label="item.dname"
19 :value="item.dcode"
20 >
11 </el-option> 21 </el-option>
12 </el-select> 22 </el-select>
13 </el-form-item> 23 </el-form-item>
14 </el-col> 24 </el-col>
15 <el-col :span="5"> 25 <el-col :span="5">
16 <el-form-item label="不动产单元号"> 26 <el-form-item label="不动产单元号">
17 <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width200px"> 27 <el-input
28 placeholder="请输入不动产单元号"
29 v-model="queryForm.bdcdyh"
30 clearable
31 class="width200px"
32 >
18 </el-input> 33 </el-input>
19 </el-form-item> 34 </el-form-item>
20 </el-col> 35 </el-col>
21 <el-col :span="5"> 36 <el-col :span="5">
22 <el-form-item label="不动产权证号"> 37 <el-form-item label="不动产权证号">
23 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width200px"> 38 <el-input
39 placeholder="请输入不动产权证号"
40 v-model="queryForm.bdcqzh"
41 clearable
42 class="width200px"
43 >
24 </el-input> 44 </el-input>
25 </el-form-item> 45 </el-form-item>
26 </el-col> 46 </el-col>
27 <el-col :span="5"> 47 <el-col :span="5">
28 <el-form-item label="业务号"> 48 <el-form-item label="业务号">
29 <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width200px"> 49 <el-input
50 placeholder="请输入业务号"
51 v-model="queryForm.ywh"
52 clearable
53 class="width200px"
54 >
30 </el-input> 55 </el-input>
31 </el-form-item> 56 </el-form-item>
32 </el-col> 57 </el-col>
...@@ -42,9 +67,17 @@ ...@@ -42,9 +67,17 @@
42 </div> 67 </div>
43 <!-- 表格 --> 68 <!-- 表格 -->
44 <div class="from-clues-content"> 69 <div class="from-clues-content">
45 <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current" 70 <lb-table
46 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 71 :page-size="pageData.size"
47 :column="tableData.columns" :data="tableData.data"> 72 border
73 @sort-change="handleSort"
74 :current-page.sync="pageData.current"
75 :total="tableData.total"
76 @size-change="handleSizeChange"
77 @p-current-change="handleCurrentChange"
78 :column="tableData.columns"
79 :data="tableData.data"
80 >
48 </lb-table> 81 </lb-table>
49 </div> 82 </div>
50 </div> 83 </div>
...@@ -58,10 +91,10 @@ import { mapGetters } from "vuex"; ...@@ -58,10 +91,10 @@ import { mapGetters } from "vuex";
58 export default { 91 export default {
59 name: "djbcx", 92 name: "djbcx",
60 mixins: [table], 93 mixins: [table],
61 mounted () { 94 mounted() {
62 sendThis(this); 95 sendThis(this);
63 }, 96 },
64 data () { 97 data() {
65 return { 98 return {
66 queryForm: { 99 queryForm: {
67 qllx: "", 100 qllx: "",
...@@ -74,7 +107,6 @@ export default { ...@@ -74,7 +107,6 @@ export default {
74 size: 10, 107 size: 10,
75 total: 0, 108 total: 0,
76 }, 109 },
77 ywlys: datas.ywlys(),
78 tableData: { 110 tableData: {
79 columns: datas.columns(), 111 columns: datas.columns(),
80 data: [], 112 data: [],
...@@ -89,43 +121,44 @@ export default { ...@@ -89,43 +121,44 @@ export default {
89 }, 121 },
90 methods: { 122 methods: {
91 // 初始化数据 123 // 初始化数据
92 fetchData () { 124 fetchData() {
125 debugger;
93 getDjbBysearch({ ...this.queryForm, ...this.pageData }).then((res) => { 126 getDjbBysearch({ ...this.queryForm, ...this.pageData }).then((res) => {
94 if (res.code === 200) { 127 if (res.code === 200) {
95 let { total, records } = res.result; 128 let { total, records } = res.result;
96 this.pageData.total = total;
97 this.tableData.data = records; 129 this.tableData.data = records;
130 this.tableData.total = total;
98 } 131 }
99 }); 132 });
100 }, 133 },
101 handleSort (name, sort) { 134 handleSort(name, sort) {
102 console.log(name, sort); 135 console.log(name, sort);
103 }, 136 },
104 // 查询 137 // 查询
105 queryClick () { 138 queryClick() {
106 this.pageData.current = 1; 139 // this.pageData.current = 1;
107 this.pageData.currentPage = 1; 140 // this.pageData.currentPage = 1;
108 this.fetchData(); 141 this.fetchData();
109 }, 142 },
110 // 高级查询 143 // 高级查询
111 moreQueryClick () { }, 144 moreQueryClick() {},
112 openDialog (scroll) { 145 openDialog(scroll) {
113 this.$popup({ 146 this.$popup({
114 titleStyle:"left", 147 titleStyle: "left",
115 title: '登记簿详情', // 弹窗标题 148 title: "登记簿详情", // 弹窗标题
116 editItem: 'registerBook/djbFrame', // 弹窗内容 149 editItem: "registerBook/djbFrame", // 弹窗内容
117 formData: scroll, 150 formData: scroll,
118 width:"1220px", 151 width: "1220px",
119 height:"790px", 152 height: "790px",
120 // cancelText: '取消摆烂', // 右边按钮文本 153 // cancelText: '取消摆烂', // 右边按钮文本
121 // confirmText: '确定点击', //左边按钮文本 154 // confirmText: '确定点击', //左边按钮文本
122 cancel: () => { 155 cancel: () => {
123 console.log('取消回调') 156 console.log("取消回调");
124 }, 157 },
125 confirm: () => { 158 confirm: () => {
126 console.log('确认回调') 159 console.log("确认回调");
127 } 160 },
128 }); 161 });
129 }, 162 },
130 }, 163 },
131 }; 164 };
......
...@@ -35,7 +35,7 @@ class data extends filter { ...@@ -35,7 +35,7 @@ class data extends filter {
35 text: '历史', 35 text: '历史',
36 color: '#AAAAAA' 36 color: '#AAAAAA'
37 }, 37 },
38 "3": { 38 "0": {
39 text: '临时', 39 text: '临时',
40 color: '#FE9400' 40 color: '#FE9400'
41 } 41 }
...@@ -110,15 +110,6 @@ class data extends filter { ...@@ -110,15 +110,6 @@ class data extends filter {
110 ] 110 ]
111 } 111 }
112 112
113 ywlys () {
114 return [
115 { value: 1, label: "办事大厅" },
116 { value: 2, label: "微信小程序" },
117 { value: 3, label: "法院端" },
118 { value: 4, label: "银行端" },
119 ]
120 }
121
122 } 113 }
123 let datas = new data() 114 let datas = new data()
124 export { 115 export {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 </div> 46 </div>
47 <!-- 表格 --> 47 <!-- 表格 -->
48 <div class="from-clues-content"> 48 <div class="from-clues-content">
49 <lb-table :page-size="pageData.pageSize" @sort-change="handleSort" :current-page.sync="pageData.currentPage" 49 <lb-table border :page-size="pageData.pageSize" @sort-change="handleSort" :current-page.sync="pageData.currentPage"
50 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 50 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
51 :column="tableData.columns" :data="tableData.data"> 51 :column="tableData.columns" :data="tableData.data">
52 </lb-table> 52 </lb-table>
......
...@@ -36,7 +36,7 @@ class data extends filter { ...@@ -36,7 +36,7 @@ class data extends filter {
36 label: "坐落", 36 label: "坐落",
37 }, 37 },
38 { 38 {
39 prop: "yt", 39 prop: "showFwyt",
40 label: "用途", 40 label: "用途",
41 }, 41 },
42 { 42 {
......
...@@ -2,17 +2,23 @@ ...@@ -2,17 +2,23 @@
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"> 5 <el-form :model="queryForm" ref="queryForm" label-width="100px">
6 <el-row> 6 <el-row>
7 <el-col :span="5"> 7 <el-col :span="5">
8 <el-form-item label="不动产权证号"> 8 <el-form-item label="不动产权证号">
9 <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh"> 9 <el-input
10 placeholder="请输入不动产权证号"
11 v-model="queryForm.bdcqzh"
12 >
10 </el-input> 13 </el-input>
11 </el-form-item> 14 </el-form-item>
12 </el-col> 15 </el-col>
13 <el-col :span="5"> 16 <el-col :span="5">
14 <el-form-item label="印刷序列号"> 17 <el-form-item label="印刷序列号">
15 <el-input placeholder="请输入印刷序列号" v-model="queryForm.ysxlh"> 18 <el-input
19 placeholder="请输入印刷序列号"
20 v-model="queryForm.ysxlh"
21 >
16 </el-input> 22 </el-input>
17 </el-form-item> 23 </el-form-item>
18 </el-col> 24 </el-col>
...@@ -31,7 +37,11 @@ ...@@ -31,7 +37,11 @@
31 37
32 <el-col :span="4" class="btnColRight"> 38 <el-col :span="4" class="btnColRight">
33 <el-form-item> 39 <el-form-item>
34 <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button> 40 <el-button
41 type="primary"
42 @click="queryClick()"
43 >查询</el-button
44 >
35 <el-button @click="moreQueryClick()">高级查询</el-button> 45 <el-button @click="moreQueryClick()">高级查询</el-button>
36 </el-form-item> 46 </el-form-item>
37 </el-col> 47 </el-col>
...@@ -40,9 +50,15 @@ ...@@ -40,9 +50,15 @@
40 </div> 50 </div>
41 <!-- 表格 --> 51 <!-- 表格 -->
42 <div class="from-clues-content"> 52 <div class="from-clues-content">
43 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total" 53 <lb-table
44 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 54 :page-size="pageData.size"
45 :data="tableData.data"> 55 :current-page.sync="pageData.current"
56 :total="tableData.total"
57 @size-change="handleSizeChange"
58 @p-current-change="handleCurrentChange"
59 :column="tableData.columns"
60 :data="tableData.data"
61 >
46 </lb-table> 62 </lb-table>
47 </div> 63 </div>
48 </div> 64 </div>
...@@ -53,32 +69,34 @@ import { datas, sendThis } from "./zslqcx"; ...@@ -53,32 +69,34 @@ import { datas, sendThis } from "./zslqcx";
53 export default { 69 export default {
54 components: {}, 70 components: {},
55 mixins: [table], 71 mixins: [table],
56 mounted () { 72 mounted() {
57 sendThis(this); 73 sendThis(this);
58 }, 74 },
59 data () { 75 data() {
60 return { 76 return {
61 queryForm: { 77 queryForm: {
62 bdcqzh: '', 78 bdcqzh: "",
63 ysxlh: '', 79 ysxlh: "",
64 ywh: '', 80 ywh: "",
65 lqr: '' 81 lqr: "",
66 }, 82 },
67 tableData: { 83 tableData: {
68 columns: datas.columns(), 84 columns: datas.columns(),
69 data: [ 85 data: [],
70 { 86 },
71 qllx: 'A01' 87 };
72 }
73 ]
74 }
75 }
76 }, 88 },
77 methods: { 89 methods: {
90 // 查询
91 queryClick() {
92 this.fetchData();
93 },
94
78 // 初始化数据 95 // 初始化数据
79 fetchData () { }, 96 fetchData() {
80 } 97 },
81 } 98 },
99 };
82 </script> 100 </script>
83 <style scoped lang="scss"> 101 <style scoped lang="scss">
84 @import "~@/styles/public.scss"; 102 @import "~@/styles/public.scss";
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
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"> 5 <el-form :model="queryForm" ref="queryForm" label-width="80px">
6 <el-row> 6 <el-row>
7 <el-col :span="5"> 7 <el-col :span="5">
8 <el-form-item label="项目名称"> 8 <el-form-item label="项目名称">
...@@ -31,7 +31,11 @@ ...@@ -31,7 +31,11 @@
31 31
32 <el-col :span="4" class="btnColRight"> 32 <el-col :span="4" class="btnColRight">
33 <el-form-item> 33 <el-form-item>
34 <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button> 34 <el-button
35 type="primary"
36 @click="queryClick()"
37 >查询</el-button
38 >
35 <el-button @click="moreQueryClick()">高级查询</el-button> 39 <el-button @click="moreQueryClick()">高级查询</el-button>
36 </el-form-item> 40 </el-form-item>
37 </el-col> 41 </el-col>
...@@ -40,9 +44,15 @@ ...@@ -40,9 +44,15 @@
40 </div> 44 </div>
41 <!-- 表格 --> 45 <!-- 表格 -->
42 <div class="from-clues-content"> 46 <div class="from-clues-content">
43 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total" 47 <lb-table
44 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 48 :page-size="pageData.size"
45 :data="tableData.data"> 49 :current-page.sync="pageData.current"
50 :total="tableData.total"
51 @size-change="handleSizeChange"
52 @p-current-change="handleCurrentChange"
53 :column="tableData.columns"
54 :data="tableData.data"
55 >
46 </lb-table> 56 </lb-table>
47 </div> 57 </div>
48 </div> 58 </div>
...@@ -53,29 +63,33 @@ import { datas, sendThis } from "./zxgcdycx"; ...@@ -53,29 +63,33 @@ import { datas, sendThis } from "./zxgcdycx";
53 export default { 63 export default {
54 components: {}, 64 components: {},
55 mixins: [table], 65 mixins: [table],
56 mounted () { 66 mounted() {
57 sendThis(this); 67 sendThis(this);
58 }, 68 },
59 data () { 69 data() {
60 return { 70 return {
61 queryForm: { 71 queryForm: {
62 xmmc: '', 72 xmmc: "",
63 xmbh: '', 73 xmbh: "",
64 zrzh: '', 74 zrzh: "",
65 zddm: '' 75 zddm: "",
66 }, 76 },
67 tableData: { 77 tableData: {
68 columns: datas.columns(), 78 columns: datas.columns(),
69 data: [ 79 data: [],
70 ] 80 },
71 } 81 };
72 }
73 }, 82 },
74 methods: { 83 methods: {
84 // 查询
85 queryClick() {
86 this.fetchData();
87 },
88
75 // 初始化数据 89 // 初始化数据
76 fetchData () { }, 90 fetchData() {},
77 } 91 },
78 } 92 };
79 </script> 93 </script>
80 <style scoped lang="scss"> 94 <style scoped lang="scss">
81 @import "~@/styles/public.scss"; 95 @import "~@/styles/public.scss";
......