Skip to content

bdc / bdcdj-web

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

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

2 parents 1ed8e0b4 c008f333
Inline Side-by-side
Showing 3 changed files with 78 additions and 35 deletions
...@@ -3,7 +3,6 @@ import request from '@/utils/request' ...@@ -3,7 +3,6 @@ import request from '@/utils/request'
3 楼盘查询 3 楼盘查询
4 */ 4 */
5 5
6
7 // 根据条件进行列表查询 6 // 根据条件进行列表查询
8 export function getLpZrz(data) { 7 export function getLpZrz(data) {
9 return request({ 8 return request({
...@@ -13,7 +12,6 @@ export function getLpZrz(data) { ...@@ -13,7 +12,6 @@ export function getLpZrz(data) {
13 }) 12 })
14 } 13 }
15 14
16
17 // 获取楼盘表 15 // 获取楼盘表
18 export function getLpb(params) { 16 export function getLpb(params) {
19 return request({ 17 return request({
...@@ -22,5 +20,3 @@ export function getLpb(params) { ...@@ -22,5 +20,3 @@ export function getLpb(params) {
22 params 20 params
23 }) 21 })
24 } 22 }
25
26
......
...@@ -6,25 +6,45 @@ ...@@ -6,25 +6,45 @@
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.xmmc" clearable class="width200px"> 9 <el-input
10 placeholder="请输入项目名称"
11 v-model="queryForm.xmmc"
12 clearable
13 class="width200px"
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="5"> 18 <el-col :span="5">
14 <el-form-item label="项目编号"> 19 <el-form-item label="项目编号">
15 <el-input placeholder="请输入项目编号" v-model="queryForm.xmbh" clearable class="width200px"> 20 <el-input
21 placeholder="请输入项目编号"
22 v-model="queryForm.xmbh"
23 clearable
24 class="width200px"
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="5"> 29 <el-col :span="5">
20 <el-form-item label="宗地代码"> 30 <el-form-item label="宗地代码">
21 <el-input placeholder="请输入宗地代码" v-model="queryForm.zddm" clearable class="width200px"> 31 <el-input
32 placeholder="请输入宗地代码"
33 v-model="queryForm.zddm"
34 clearable
35 class="width200px"
36 >
22 </el-input> 37 </el-input>
23 </el-form-item> 38 </el-form-item>
24 </el-col> 39 </el-col>
25 <el-col :span="5"> 40 <el-col :span="5">
26 <el-form-item label="自然幢号"> 41 <el-form-item label="自然幢号">
27 <el-input placeholder="请输入自然幢号" v-model="queryForm.zrzh" clearable class="width200px"> 42 <el-input
43 placeholder="请输入自然幢号"
44 v-model="queryForm.zrzh"
45 clearable
46 class="width200px"
47 >
28 </el-input> 48 </el-input>
29 </el-form-item> 49 </el-form-item>
30 </el-col> 50 </el-col>
...@@ -40,9 +60,17 @@ ...@@ -40,9 +60,17 @@
40 </div> 60 </div>
41 <!-- 表格 --> 61 <!-- 表格 -->
42 <div class="from-clues-content"> 62 <div class="from-clues-content">
43 <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current" 63 <lb-table
44 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 64 :page-size="pageData.size"
45 :column="tableData.columns" :data="tableData.data"> 65 border
66 @sort-change="handleSort"
67 :current-page.sync="pageData.current"
68 :total="pageData.total"
69 @size-change="handleSizeChange"
70 @p-current-change="handleCurrentChange"
71 :column="tableData.columns"
72 :data="tableData.data"
73 >
46 </lb-table> 74 </lb-table>
47 </div> 75 </div>
48 </div> 76 </div>
...@@ -50,15 +78,15 @@ ...@@ -50,15 +78,15 @@
50 <script> 78 <script>
51 import table from "@/utils/mixin/table"; 79 import table from "@/utils/mixin/table";
52 import { datas, sendThis } from "./lpcxdata"; 80 import { datas, sendThis } from "./lpcxdata";
53 import { getLpZrz,getLpb } from "@/api/lpb.js" 81 import { getLpZrz, getLpb } from "@/api/lpb.js";
54 export default { 82 export default {
55 name: "lpcx", 83 name: "lpcx",
56 components: {}, 84 components: {},
57 mixins: [table], 85 mixins: [table],
58 mounted () { 86 mounted() {
59 sendThis(this); 87 sendThis(this);
60 }, 88 },
61 data () { 89 data() {
62 return { 90 return {
63 queryForm: { 91 queryForm: {
64 xmmc: "", 92 xmmc: "",
...@@ -73,43 +101,62 @@ export default { ...@@ -73,43 +101,62 @@ export default {
73 }, 101 },
74 tableData: { 102 tableData: {
75 columns: datas.columns(), 103 columns: datas.columns(),
76 data: [] 104 data: [],
77 } 105 },
78 }; 106 };
79 }, 107 },
80 methods: { 108 methods: {
81 //查询 109 //查询
82 queryClick(){ 110 queryClick() {
83 this.fetchData(); 111 this.fetchData();
84 }, 112 },
85 113
86 // 初始化数据 114 // 初始化数据
87 fetchData () { 115 fetchData() {
88 getLpZrz({ ...this.queryForm, ...this.pageData }).then(res => { 116 getLpZrz({ ...this.queryForm, ...this.pageData }).then((res) => {
89 if (res.code === 200) { 117 if (res.code === 200) {
90 this.pageData.total = res.result.total; 118 this.pageData.total = res.result.total;
91 this.tableData.data = res.result.records 119 this.tableData.data = res.result.records;
92 } 120 }
93 }) 121 });
94 }, 122 },
95 123
96 handleSort (name, sort) { 124 handleSort(name, sort) {
97 console.log(name, sort); 125 console.log(name, sort);
98 }, 126 },
99 127
100 //打开楼盘表 128 //打开楼盘表
101 openlpbDialog (scope) { 129 openlpbClick(scope) {
102 debugger; 130 debugger;
103 var zrzbsm=scope.row.bsm; 131 var zrzbsm = scope.row.bsm;
104 132
105 getLpb({zrzbsm:zrzbsm}).then(res => { 133 let that = this;
106 if(res.code == 200){ 134 this.$popup({
107 var lpbdata = res.result; 135 title: "楼盘表",
108 } 136 width: "100%",
109 }) 137 btnShow: true,
110 .catch((error) => { 138 editItem: "xxxxxxxxxx",
111 console.log(error); 139 height: "1200px",
112 }); 140 formData: {
141 bsmSlsq: this.bsmSlsq,
142 dataList: this.unitData,
143 },
144 cancel: function () { }, //取消事件的回调
145 confirm: function () {
146 that.loadBdcdylist();
147 }, //确认事件的回调
148 });
149
150
151 // getLpb({ zrzbsm: zrzbsm })
152 // .then((res) => {
153 // if (res.code == 200) {
154 // var lpbdata = res.result;
155 // }
156 // })
157 // .catch((error) => {
158 // console.log(error);
159 // });
113 }, 160 },
114 }, 161 },
115 }; 162 };
......
...@@ -8,7 +8,7 @@ class data extends filter { ...@@ -8,7 +8,7 @@ class data extends filter {
8 constructor() { 8 constructor() {
9 super() 9 super()
10 } 10 }
11 columns () { 11 columns() {
12 return [ 12 return [
13 { 13 {
14 label: '序号', 14 label: '序号',
...@@ -57,7 +57,7 @@ class data extends filter { ...@@ -57,7 +57,7 @@ class data extends filter {
57 align: 'center', 57 align: 'center',
58 fixed: 'right', 58 fixed: 'right',
59 render: (h, scope) => { 59 render: (h, scope) => {
60 return <el-button type="text" icon="el-icon-film" onClick={() => { vm.openlpbDialog(scope) }}>楼盘表</el-button> 60 return <el-button type="text" icon="el-icon-film" onClick={() => { vm.openlpbClick(scope) }}>楼盘表</el-button>
61 } 61 }
62 } 62 }
63 ] 63 ]
......