Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5e61439b by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/panel/change/fwsxbg/index.vue
2 parents 867c6bbc 2dd00fd9
Expand all
Inline Side-by-side
Showing 7 changed files with 110 additions and 68 deletions
...@@ -57,6 +57,7 @@ table,td,tr,.el-col,.title{ ...@@ -57,6 +57,7 @@ table,td,tr,.el-col,.title{
57 } 57 }
58 input:disabled{ 58 input:disabled{
59 cursor: not-allowed; 59 cursor: not-allowed;
60 background-color: #F5F7FA;
60 } 61 }
61 .formInput:focus{ 62 .formInput:focus{
62 border: 1px solid #A0C5F6!important; 63 border: 1px solid #A0C5F6!important;
...@@ -148,16 +149,22 @@ ol, ul { list-style:none; } ...@@ -148,16 +149,22 @@ ol, ul { list-style:none; }
148 font-size: 12px; 149 font-size: 12px;
149 font-weight: 400; 150 font-weight: 400;
150 color: #333; 151 color: #333;
151 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3); 152 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
152 } 153 li {
153 .contextmenu li { 154 margin: 0;
154 margin: 0; 155 padding: 7px 16px;
155 padding: 7px 16px; 156 cursor: pointer;
156 cursor: pointer; 157 }
157 } 158 li:hover {
158 159 background: #eee;
159 .contextmenu li:hover { 160 }
160 background: #eee; 161 .noEdit{
162 color: #E6E6E6;
163 cursor: not-allowed;
164 }
165 .noEdit:hover{
166 background: #ffffff;
167 }
161 } 168 }
162 // end 169 // end
163 //生成按钮样式 170 //生成按钮样式
......
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
132 <li> 132 <li>
133 <input 133 <input
134 type="text" 134 type="text"
135 style="top: -1px;"
135 :disabled="formData.qszt!='0'" 136 :disabled="formData.qszt!='0'"
136 placeholder="请输入" 137 placeholder="请输入"
137 v-model="childItem.pzytdm" 138 v-model="childItem.pzytdm"
...@@ -422,6 +423,8 @@ export default { ...@@ -422,6 +423,8 @@ export default {
422 input { 423 input {
423 position: relative; 424 position: relative;
424 top: -2px; 425 top: -2px;
426 height: 35px;
427 width: calc(100% - 1px) !important;
425 } 428 }
426 .el-input__inner { 429 .el-input__inner {
427 height: 34px; 430 height: 34px;
......
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
62 <li v-show="isZD">导入属性</li> 62 <li v-show="isZD">导入属性</li>
63 <li v-show="!isZD">导入楼盘</li> 63 <li v-show="!isZD">导入楼盘</li>
64 <li>重叠分析</li> 64 <li>重叠分析</li>
65 <li v-show="isZD" @click="openCreateDialog">添加定着物</li> 65 <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
66 <li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
66 <li @click="deleteByBsm()">删除</li> 67 <li @click="deleteByBsm()">删除</li>
67 </ul> 68 </ul>
68 <ul 69 <ul
...@@ -131,7 +132,9 @@ export default { ...@@ -131,7 +132,9 @@ export default {
131 //控制新建宗地菜单 132 //控制新建宗地菜单
132 createVisible:false, 133 createVisible:false,
133 //多幢 134 //多幢
134 dzVisible:false 135 dzVisible:false,
136 //宗地权属状态
137 zdQszt:null,
135 }; 138 };
136 }, 139 },
137 watch: { 140 watch: {
...@@ -175,7 +178,8 @@ export default { ...@@ -175,7 +178,8 @@ export default {
175 this.visible = data; 178 this.visible = data;
176 }, 179 },
177 changeZdData(data) { 180 changeZdData(data) {
178 this.zdData = data 181 this.zdData = data;
182 this.zdQszt = data.qszt;
179 }, 183 },
180 changeTop(data) { 184 changeTop(data) {
181 this.top = data; 185 this.top = data;
......
...@@ -121,55 +121,59 @@ export default { ...@@ -121,55 +121,59 @@ export default {
121 }, 121 },
122 //点击办理 122 //点击办理
123 handleClick(row) { 123 handleClick(row) {
124 console.log("fwsxbg"); 124 let params = { bsm: row.glbsm, type: row.dylx };
125 console.log(row); 125 this.$confirm('是否确定范围属性变更?', '提示', {
126 var params = { bsm: row.glbsm, type: row.dylx }; 126 confirmButtonText: '确定',
127 fwsxbgbl(params) 127 cancelButtonText: '取消',
128 .then((res) => { 128 type: 'warning'
129 if (res.code == 200) { 129 }).then(() => {
130 this.$message({ 130 fwsxbgbl(params)
131 message: res.message, 131 .then((res) => {
132 type: "success", 132 if (res.code == 200) {
133 }); 133 this.$message({
134 var newGlbsm=res.result; 134 message: res.message,
135 135 type: "变更成功",
136 let path = ""; 136 });
137 switch (row.dylx) { 137 let path = "";
138 case "zrz": 138 switch (row.dylx) {
139 this.$store.state.zrzbsm = newGlbsm; 139 case "zrz":
140 path = "/zrz"; 140 this.$store.state.zrzbsm = res.result;
141 break; 141 path = "/zrz";
142 case "zd": 142 break;
143 this.$store.state.zdbsm = newGlbsm; 143 case "zd":
144 path = "/zd"; 144 this.$store.state.zdbsm = res.result;
145 break; 145 path = "/zd";
146 case "dz": 146 break;
147 this.$store.state.dzbsm = newGlbsm; 147 case "dz":
148 path = "/dz"; 148 this.$store.state.dzbsm = res.result;
149 break; 149 path = "/dz";
150 default: 150 break;
151 break; 151 default:
152 } 152 break;
153 this.$router.push({
154 path: path,
155 query: {
156 bsm: newGlbsm,
157 source: 2
158 } 153 }
159 }); 154 this.$router.push({
160 } else { 155 path: path,
161 this.$message({ 156 query: {
162 message: res.message, 157 bsm: newGlbsm,
163 type: "warning", 158 source: 2
164 }); 159 }
165 } 160 });
166 }) 161 } else {
162 this.$message({
163 message: res.message,
164 type: "warning",
165 });
166 }
167 })
167 .catch((error) => { 168 .catch((error) => {
168 this.$message({ 169 this.$message({
169 message: res.message, 170 message: res.message,
170 type: "error", 171 type: "error",
171 }); 172 });
172 }); 173 });
174 }).catch(() => {
175
176 });
173 177
174 }, 178 },
175 }, 179 },
......
...@@ -215,12 +215,23 @@ ...@@ -215,12 +215,23 @@
215 215
216 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> 216 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
217 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> 217 <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
218 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> 218 <el-button
219 type="primary"
220 style="margin-right: 10px"
221 class="changeBtn addMinus inAdd"
222 @click="addYtInfo"
223 >+</el-button
224 >
219 <span>用途<i class="requisite">*</i></span> 225 <span>用途<i class="requisite">*</i></span>
220 </td> 226 </td>
221 227
222 <td width="30" colspan="1" align="center" > 228 <td width="30" colspan="1" align="center" >
223 <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> 229 <el-button
230 type="primary"
231 class="changeBtn addMinus inMinus"
232 @click="deleteYtInfo(index)"
233 >-</el-button
234 >
224 规划用途 235 规划用途
225 </td> 236 </td>
226 <td width="30" colspan="4" align="center" > 237 <td width="30" colspan="4" align="center" >
...@@ -256,7 +267,14 @@ ...@@ -256,7 +267,14 @@
256 267
257 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 268 <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
258 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" > 269 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
259 <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> 270 <!-- <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> -->
271 <el-button
272 type="primary"
273 style="margin-right: 10px"
274 class="changeBtn addMinus inAdd"
275 @click="addFwjgInfo"
276 >+</el-button
277 >
260 <span>房屋结构<i class="requisite">*</i></span> 278 <span>房屋结构<i class="requisite">*</i></span>
261 </td> 279 </td>
262 <td colspan="1" align="center" > 280 <td colspan="1" align="center" >
...@@ -808,7 +826,6 @@ ...@@ -808,7 +826,6 @@
808 826
809 td{ 827 td{
810 //bgcolor:#F1F4FC; 828 //bgcolor:#F1F4FC;
811 bgcolor:#fff;
812 width:8.33% 829 width:8.33%
813 } 830 }
814 831
...@@ -824,4 +841,11 @@ ...@@ -824,4 +841,11 @@
824 .hTable{ 841 .hTable{
825 margin-top: 10px; 842 margin-top: 10px;
826 } 843 }
844
845 /deep/.el-select-tree{
846 width: 100%;
847 .el-input__inner{
848 height: 30px !important;
849 }
850 }
827 </style> 851 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,19 +13,19 @@ ...@@ -13,19 +13,19 @@
13 <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm"> 13 <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
14 </td> 14 </td>
15 <td colspan="2" >自然幢号<i class="requisite">*</i></td> 15 <td colspan="2" >自然幢号<i class="requisite">*</i></td>
16 <td colspan="4" > 16 <td colspan="4" class="psr">
17 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh"> 17 <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh">
18 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
18 </td> 19 </td>
19 </tr> 20 </tr>
20 <tr> 21 <tr>
21 <td colspan="2" >项目名称<i class="requisite">*</i></td> 22 <td colspan="2" >项目名称<i class="requisite">*</i></td>
22 <td colspan="4" > 23 <td colspan="4" >
23 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc"> 24 <input class="formInput " :disabled="form.qszt!='0'" v-model="form.xmmc">
24 </td> 25 </td>
25 <td colspan="2" >不动产单元号<i class="requisite">*</i></td> 26 <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
26 <td colspan="4" class="psr"> 27 <td colspan="4">
27 <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.bdcdyh"> 28 <input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh">
28 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
29 </td> 29 </td>
30 </tr> 30 </tr>
31 31
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 </td> 150 </td>
151 151
152 <td colspan="1" style="min-width:120px"> 152 <td colspan="1" style="min-width:120px">
153 <el-button type="info" class="outMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button> 153 <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
154 规划用途 154 规划用途
155 </td> 155 </td>
156 <td colspan="3" > 156 <td colspan="3" >
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
190 <span>房屋结构<i class="requisite">*</i></span> 190 <span>房屋结构<i class="requisite">*</i></span>
191 </td> 191 </td>
192 <td colspan="1" > 192 <td colspan="1" >
193 <el-button type="primary" class="outMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button> 193 <el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
194 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span> 194 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
195 </td> 195 </td>
196 <td colspan="9" > 196 <td colspan="9" >
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
272 272
273 <script> 273 <script>
274 import Qlr from "../../../components/formMenu/qlr"; 274 import Qlr from "../../../components/formMenu/qlr";
275 import Qlxz from "../../../components/formMenu/qlxz"; 275 import Qlxz from "../../../components/formMenu/qlxz_simple";
276 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" 276 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
277 import {getQjZdjbxxDetailById} from "../../../api/zd" 277 import {getQjZdjbxxDetailById} from "../../../api/zd"
278 import {submit} from "../../../api/common" 278 import {submit} from "../../../api/common"
......