Merge remote-tracking branch 'origin/master'
Showing
6 changed files
with
74 additions
and
13 deletions
... | @@ -83,4 +83,16 @@ export function getTreeByZrzbsm(zrzbsm) { | ... | @@ -83,4 +83,16 @@ export function getTreeByZrzbsm(zrzbsm) { |
83 | zrzbsm | 83 | zrzbsm |
84 | } | 84 | } |
85 | }) | 85 | }) |
86 | } | ||
87 | |||
88 | |||
89 | /**x | ||
90 | *修改 宗地,自然幢,户的权属状态 | ||
91 | */ | ||
92 | export function updateQsztByBsm(data){ | ||
93 | return request({ | ||
94 | url: '/gz/updateByBsm', | ||
95 | method: 'post', | ||
96 | data: data | ||
97 | }) | ||
86 | } | 98 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -226,7 +226,8 @@ export default { | ... | @@ -226,7 +226,8 @@ export default { |
226 | width: 22px; | 226 | width: 22px; |
227 | left: 9px; | 227 | left: 9px; |
228 | top: 9px; | 228 | top: 9px; |
229 | background: #c3c5c8; | 229 | background: url('../../assets/images/rowline.png'); |
230 | background-position-y: center; | ||
230 | } | 231 | } |
231 | 232 | ||
232 | .linkLine_default::after { | 233 | .linkLine_default::after { | ... | ... |
... | @@ -56,14 +56,19 @@ | ... | @@ -56,14 +56,19 @@ |
56 | <li v-show="isZD">导入属性</li> | 56 | <li v-show="isZD">导入属性</li> |
57 | <li v-show="!isZD">导入楼盘</li> | 57 | <li v-show="!isZD">导入楼盘</li> |
58 | <li>重叠分析</li> | 58 | <li>重叠分析</li> |
59 | <li v-show="isZD">添加定着物</li> | 59 | <li v-show="isZD" @click="openCreateDialog">添加定着物</li> |
60 | <li @click="deleteByBsm()">删除</li> | 60 | <li @click="deleteByBsm()">删除</li> |
61 | </ul> | 61 | </ul> |
62 | <!-- 添加定着物弹框 --> | ||
63 | <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> | ||
64 | <Create @closeDialog="closeDialog" :auth="true"></Create> | ||
65 | </el-dialog> | ||
62 | </div> | 66 | </div> |
63 | </template> | 67 | </template> |
64 | <script> | 68 | <script> |
65 | import lineItem from "./lineItem.vue"; | 69 | import lineItem from "./lineItem.vue"; |
66 | import {deleteZdInfoByBsm} from "../../api/zd"; | 70 | import {deleteZdInfoByBsm} from "../../api/zd"; |
71 | import Create from "../../views/panel/create/index"; | ||
67 | export default { | 72 | export default { |
68 | inheritAttrs: false, | 73 | inheritAttrs: false, |
69 | props: { | 74 | props: { |
... | @@ -73,7 +78,7 @@ export default { | ... | @@ -73,7 +78,7 @@ export default { |
73 | default: 14, | 78 | default: 14, |
74 | }, | 79 | }, |
75 | }, | 80 | }, |
76 | components: { lineItem }, | 81 | components: { lineItem,Create }, |
77 | data() { | 82 | data() { |
78 | return { | 83 | return { |
79 | selectedDetail: {}, | 84 | selectedDetail: {}, |
... | @@ -83,7 +88,8 @@ export default { | ... | @@ -83,7 +88,8 @@ export default { |
83 | top: 0, | 88 | top: 0, |
84 | left: 0, | 89 | left: 0, |
85 | isZD: true, | 90 | isZD: true, |
86 | zdData:{} | 91 | zdData:{}, |
92 | dialogVisible:false | ||
87 | }; | 93 | }; |
88 | }, | 94 | }, |
89 | watch: { | 95 | watch: { |
... | @@ -115,6 +121,14 @@ export default { | ... | @@ -115,6 +121,14 @@ export default { |
115 | changeIsZD(data) { | 121 | changeIsZD(data) { |
116 | this.isZD = data; | 122 | this.isZD = data; |
117 | }, | 123 | }, |
124 | //添加定着物 | ||
125 | openCreateDialog(){ | ||
126 | this.dialogVisible = true | ||
127 | }, | ||
128 | //关闭添加定着物弹框 | ||
129 | closeDialog() { | ||
130 | this.dialogVisible = false; | ||
131 | }, | ||
118 | preDealData(list) { | 132 | preDealData(list) { |
119 | list.forEach((x) => { | 133 | list.forEach((x) => { |
120 | if (!x.expand) this.$set(x, "expand", true); | 134 | if (!x.expand) this.$set(x, "expand", true); |
... | @@ -160,8 +174,23 @@ export default { | ... | @@ -160,8 +174,23 @@ export default { |
160 | }, | 174 | }, |
161 | deleteByBsm(){ | 175 | deleteByBsm(){ |
162 | var zdBsm = this.zdData.zdbsm; | 176 | var zdBsm = this.zdData.zdbsm; |
177 | var type; | ||
163 | console.log(zdBsm); | 178 | console.log(zdBsm); |
164 | deleteZdInfoByBsm(zdBsm) | 179 | switch (this.zdData.type){ |
180 | case "zd": | ||
181 | type="0"; | ||
182 | break; | ||
183 | case "zrz": | ||
184 | type="1"; | ||
185 | break; | ||
186 | case "h": | ||
187 | type="2"; | ||
188 | break; | ||
189 | default: | ||
190 | break; | ||
191 | } | ||
192 | var params={"id":zdBsm,"type":type} | ||
193 | deleteZdInfoByBsm(params) | ||
165 | .then((res) => { | 194 | .then((res) => { |
166 | if(res.code=200){ | 195 | if(res.code=200){ |
167 | this.$message({ | 196 | this.$message({ | ... | ... |
... | @@ -36,7 +36,7 @@ | ... | @@ -36,7 +36,7 @@ |
36 | <Navigation ref="navigation"></Navigation> | 36 | <Navigation ref="navigation"></Navigation> |
37 | </div> --> | 37 | </div> --> |
38 | <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> | 38 | <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> |
39 | <Create @closeDialog="closeDialog"></Create> | 39 | <Create @closeDialog="closeDialog" :auth="false"></Create> |
40 | </el-dialog> | 40 | </el-dialog> |
41 | </el-header> | 41 | </el-header> |
42 | <el-main> | 42 | <el-main> | ... | ... |
... | @@ -6,7 +6,7 @@ | ... | @@ -6,7 +6,7 @@ |
6 | type="card" | 6 | type="card" |
7 | class="eltabs" | 7 | class="eltabs" |
8 | @tab-click="handleClick"> | 8 | @tab-click="handleClick"> |
9 | <el-tab-pane class="eltabspane" label="宗地" name="zd"> | 9 | <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd"> |
10 | <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline"> | 10 | <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline"> |
11 | <el-form-item label="行政区划" required prop="xzqbsm"> | 11 | <el-form-item label="行政区划" required prop="xzqbsm"> |
12 | <el-select v-model="ruleForm.xzqbsm" style="width:100px;" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)"> | 12 | <el-select v-model="ruleForm.xzqbsm" style="width:100px;" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)"> |
... | @@ -82,7 +82,7 @@ | ... | @@ -82,7 +82,7 @@ |
82 | </el-form-item> | 82 | </el-form-item> |
83 | </el-form> | 83 | </el-form> |
84 | </el-tab-pane> | 84 | </el-tab-pane> |
85 | <el-tab-pane class="eltabspane" label="宗海" name="zh">宗海</el-tab-pane> | 85 | <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane> |
86 | <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> | 86 | <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> |
87 | <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject"> | 87 | <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject"> |
88 | <el-form-item label="项目名称" prop="xmmc"> | 88 | <el-form-item label="项目名称" prop="xmmc"> |
... | @@ -133,12 +133,12 @@ import { insertDzjbxx } from "../../../api/dz"; | ... | @@ -133,12 +133,12 @@ import { insertDzjbxx } from "../../../api/dz"; |
133 | export default { | 133 | export default { |
134 | name: "", | 134 | name: "", |
135 | components: {}, | 135 | components: {}, |
136 | props: {}, | 136 | props: ['auth'], |
137 | data() { | 137 | data() { |
138 | return { | 138 | return { |
139 | tabPosition: "left", | 139 | tabPosition: "left", |
140 | //默认第一个选项卡 | 140 | //默认第一个选项卡 |
141 | activeName: "zd", | 141 | activeName: "", |
142 | zrzProjectName: "", | 142 | zrzProjectName: "", |
143 | xzq: [], | 143 | xzq: [], |
144 | djq: [], | 144 | djq: [], |
... | @@ -211,7 +211,10 @@ export default { | ... | @@ -211,7 +211,10 @@ export default { |
211 | created() { | 211 | created() { |
212 | this.getXzqList(); | 212 | this.getXzqList(); |
213 | }, | 213 | }, |
214 | mounted() {}, | 214 | mounted() { |
215 | console.log(this,'this'); | ||
216 | this.activeName = this.auth ? 'zrz':'zd' | ||
217 | }, | ||
215 | methods: { | 218 | methods: { |
216 | handleClick(tab, event) { | 219 | handleClick(tab, event) { |
217 | console.log(tab, event); | 220 | console.log(tab, event); | ... | ... |
... | @@ -52,6 +52,7 @@ | ... | @@ -52,6 +52,7 @@ |
52 | <script> | 52 | <script> |
53 | import SearchHead from "../../../components/searchHead/searchHead"; | 53 | import SearchHead from "../../../components/searchHead/searchHead"; |
54 | import {getSearchList} from "../../../api/search"; | 54 | import {getSearchList} from "../../../api/search"; |
55 | import {updateQsztByBsm} from "../../../api/common"; | ||
55 | 56 | ||
56 | export default { | 57 | export default { |
57 | name: "", | 58 | name: "", |
... | @@ -113,17 +114,32 @@ | ... | @@ -113,17 +114,32 @@ |
113 | }, | 114 | }, |
114 | //点击办理 | 115 | //点击办理 |
115 | handleClick(row) { | 116 | handleClick(row) { |
117 | console.log(row); | ||
116 | let path = ""; | 118 | let path = ""; |
117 | switch (row.lx) { | 119 | var type; |
120 | var id = row.glbsm; | ||
121 | switch (row.dylx) { | ||
118 | case "自然幢": | 122 | case "自然幢": |
119 | path = "/zrz"; | 123 | path = "/zrz"; |
124 | type = "1"; | ||
120 | break; | 125 | break; |
121 | case "宗地": | 126 | case "zd": |
122 | path = "/zd"; | 127 | path = "/zd"; |
128 | type = "0"; | ||
123 | break; | 129 | break; |
130 | case "户": | ||
131 | path = "h"; | ||
132 | type = "2"; | ||
124 | default: | 133 | default: |
125 | break; | 134 | break; |
126 | } | 135 | } |
136 | var data={"id":id,"type":type}; | ||
137 | updateQsztByBsm(data) | ||
138 | .then((res =>{ | ||
139 | if(res.code==200){ | ||
140 | console.log(res); | ||
141 | } | ||
142 | })) | ||
127 | this.$router.push(path); | 143 | this.$router.push(path); |
128 | }, | 144 | }, |
129 | }, | 145 | }, | ... | ... |
-
Please register or sign in to post a comment