Merge branch 'dev'
Showing
15 changed files
with
115 additions
and
45 deletions
... | @@ -206,7 +206,7 @@ | ... | @@ -206,7 +206,7 @@ |
206 | } else { | 206 | } else { |
207 | this.column = _.cloneDeep(dataList); | 207 | this.column = _.cloneDeep(dataList); |
208 | this.column.splice(2, 0, { | 208 | this.column.splice(2, 0, { |
209 | prop: "fs", | 209 | prop: "qlbl", |
210 | label: "份数", | 210 | label: "份数", |
211 | }); | 211 | }); |
212 | } | 212 | } | ... | ... |
... | @@ -206,7 +206,7 @@ | ... | @@ -206,7 +206,7 @@ |
206 | } else { | 206 | } else { |
207 | this.column = _.cloneDeep(dataList); | 207 | this.column = _.cloneDeep(dataList); |
208 | this.column.splice(2, 0, { | 208 | this.column.splice(2, 0, { |
209 | prop: "fs", | 209 | prop: "qlbl", |
210 | label: "份数", | 210 | label: "份数", |
211 | }); | 211 | }); |
212 | } | 212 | } | ... | ... |
... | @@ -42,8 +42,8 @@ | ... | @@ -42,8 +42,8 @@ |
42 | </el-form-item> | 42 | </el-form-item> |
43 | </el-col> | 43 | </el-col> |
44 | <el-col :span="8"> | 44 | <el-col :span="8"> |
45 | <el-form-item label="份数" prop="fs"> | 45 | <el-form-item label="份数" prop="qlbl"> |
46 | <el-input v-model="ruleForm.fs" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | 46 | <el-input v-model="ruleForm.qlbl" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input> |
47 | </el-form-item> | 47 | </el-form-item> |
48 | </el-col> | 48 | </el-col> |
49 | 49 | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-18 13:51:27 | 4 | * @LastEditTime: 2023-08-21 10:35:58 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> | 7 | <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> |
... | @@ -146,10 +146,10 @@ | ... | @@ -146,10 +146,10 @@ |
146 | context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386); | 146 | context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386); |
147 | // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429); | 147 | // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429); |
148 | // qlqtzk | 148 | // qlqtzk |
149 | const maxWidth = 330; // 最大宽度限制 | 149 | const maxWidth = 336; // 最大宽度限制 |
150 | let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; | 150 | let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; |
151 | lines.forEach((line, index) => { | 151 | lines.forEach((line, index) => { |
152 | const y = 473 + (index * 30); // 每行文本的垂直位置 | 152 | const y = 463 + (index * 30); // 每行文本的垂直位置 |
153 | let currentLine = ''; | 153 | let currentLine = ''; |
154 | let arr = []; | 154 | let arr = []; |
155 | for (let word of line) { | 155 | for (let word of line) { | ... | ... |
... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
14 | <el-form | 14 | <el-form |
15 | :model="tableData[index]" | 15 | :model="tableData[index]" |
16 | label-width="120px" | 16 | label-width="120px" |
17 | ref="ruleFormRef'" | 17 | ref="ruleForm'" |
18 | > | 18 | > |
19 | <div class="spyj_form"> | 19 | <div class="spyj_form"> |
20 | <div class="item_left"> | 20 | <div class="item_left"> |
... | @@ -23,7 +23,10 @@ | ... | @@ -23,7 +23,10 @@ |
23 | <div class="item_right"> | 23 | <div class="item_right"> |
24 | <el-row> | 24 | <el-row> |
25 | <el-col :span="24"> | 25 | <el-col :span="24"> |
26 | <el-form-item label-width="0" class="opinion_item"> | 26 | <el-form-item |
27 | label-width="0" | ||
28 | class="opinion_item" | ||
29 | > | ||
27 | <el-input | 30 | <el-input |
28 | :disabled="!viewEdit || item.show" | 31 | :disabled="!viewEdit || item.show" |
29 | type="textarea" | 32 | type="textarea" |
... | @@ -35,7 +38,7 @@ | ... | @@ -35,7 +38,7 @@ |
35 | <el-button | 38 | <el-button |
36 | class="opinion_btn" | 39 | class="opinion_btn" |
37 | @click="commonOpinion(index)" | 40 | @click="commonOpinion(index)" |
38 | v-if="viewEdit" | 41 | :disabled="!viewEdit|| item.show" |
39 | >常用意见</el-button | 42 | >常用意见</el-button |
40 | > | 43 | > |
41 | </el-form-item> | 44 | </el-form-item> |
... | @@ -58,7 +61,9 @@ | ... | @@ -58,7 +61,9 @@ |
58 | </el-form> | 61 | </el-form> |
59 | </div> | 62 | </div> |
60 | <div class="submit_button" v-if="viewEdit"> | 63 | <div class="submit_button" v-if="viewEdit"> |
61 | <el-button type="primary" :disabled="shows" @click="onSubmit()">保存</el-button> | 64 | <el-button type="primary" :disabled="shows" @click="onSubmit()" |
65 | >保存</el-button | ||
66 | > | ||
62 | </div> | 67 | </div> |
63 | </div> | 68 | </div> |
64 | <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> --> | 69 | <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> --> |
... | @@ -87,7 +92,7 @@ export default { | ... | @@ -87,7 +92,7 @@ export default { |
87 | falg1: false, | 92 | falg1: false, |
88 | jdmc: "", | 93 | jdmc: "", |
89 | indexdqlc: 0, | 94 | indexdqlc: 0, |
90 | shows:false | 95 | shows: false, |
91 | }; | 96 | }; |
92 | }, | 97 | }, |
93 | 98 | ||
... | @@ -138,8 +143,8 @@ export default { | ... | @@ -138,8 +143,8 @@ export default { |
138 | if (res.code === 200 && res.result) { | 143 | if (res.code === 200 && res.result) { |
139 | this.$nextTick(() => { | 144 | this.$nextTick(() => { |
140 | this.tableData = res.result; | 145 | this.tableData = res.result; |
141 | if(this.shows){ | 146 | if (this.shows) { |
142 | this.shows=false | 147 | this.shows = false; |
143 | } | 148 | } |
144 | 149 | ||
145 | var index = this.tableData.findIndex( | 150 | var index = this.tableData.findIndex( |
... | @@ -169,8 +174,7 @@ export default { | ... | @@ -169,8 +174,7 @@ export default { |
169 | item.show = false; | 174 | item.show = false; |
170 | } | 175 | } |
171 | }); | 176 | }); |
172 | }) | 177 | }); |
173 | |||
174 | } | 178 | } |
175 | }); | 179 | }); |
176 | }, | 180 | }, |
... | @@ -185,11 +189,16 @@ export default { | ... | @@ -185,11 +189,16 @@ export default { |
185 | * @author: renchao | 189 | * @author: renchao |
186 | */ | 190 | */ |
187 | onSubmit() { | 191 | onSubmit() { |
188 | this.shows=true | 192 | |
189 | this.tableData.forEach((item, index) => { | 193 | this.tableData.forEach((item, index) => { |
190 | item["bsmBusiness"] = this.propsParam.bsmBusiness; | 194 | item["bsmBusiness"] = this.propsParam.bsmBusiness; |
191 | item["czjg"] = "1"; | 195 | item["czjg"] = "1"; |
192 | }); | 196 | }); |
197 | var index = this.tableData.findIndex( | ||
198 | (item) => item.shyj === null||item.shyj === "" | ||
199 | ); | ||
200 | if(index==-1){ | ||
201 | this.shows = true; | ||
193 | saveSpyjBySlsq(this.tableData).then((res) => { | 202 | saveSpyjBySlsq(this.tableData).then((res) => { |
194 | if (res.code === 200) { | 203 | if (res.code === 200) { |
195 | this.$message.success("保存成功"); | 204 | this.$message.success("保存成功"); |
... | @@ -199,9 +208,10 @@ export default { | ... | @@ -199,9 +208,10 @@ export default { |
199 | this.$message.error(res.message); | 208 | this.$message.error(res.message); |
200 | } | 209 | } |
201 | }); | 210 | }); |
202 | // } else { | 211 | }else{ |
203 | // return false; | 212 | this.$message.error("意见不能为空"); |
204 | // } | 213 | } |
214 | |||
205 | }, | 215 | }, |
206 | //打开常用意见列表弹窗 | 216 | //打开常用意见列表弹窗 |
207 | /** | 217 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: 房屋多幢受理信息 | 2 | * @Description: 房屋多幢受理信息 |
3 | * @Autor: ssq | 3 | * @Autor: ssq |
4 | * @LastEditTime: 2023-08-17 15:56:25 | 4 | * @LastEditTime: 2023-08-18 15:48:43 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="slxx"> | 7 | <div class="slxx"> |
... | @@ -87,7 +87,14 @@ | ... | @@ -87,7 +87,14 @@ |
87 | <el-row :gutter="10"> | 87 | <el-row :gutter="10"> |
88 | <el-col :span="8"> | 88 | <el-col :span="8"> |
89 | <el-form-item label="林地所有权性质:"> | 89 | <el-form-item label="林地所有权性质:"> |
90 | <el-input v-model="ruleForm.lq.ldsyqxz"></el-input> | 90 | <el-select v-model="ruleForm.lq.ldsyqxz"> |
91 | <el-option | ||
92 | v-for="item in dictData['A45']" | ||
93 | :key="item.dcode" | ||
94 | :label="item.dname" | ||
95 | :value="item.dcode"> | ||
96 | </el-option> | ||
97 | </el-select> | ||
91 | </el-form-item> | 98 | </el-form-item> |
92 | </el-col> | 99 | </el-col> |
93 | <el-col :span="8"> | 100 | <el-col :span="8"> |
... | @@ -109,12 +116,26 @@ | ... | @@ -109,12 +116,26 @@ |
109 | </el-col> | 116 | </el-col> |
110 | <el-col :span="8"> | 117 | <el-col :span="8"> |
111 | <el-form-item label="林种:"> | 118 | <el-form-item label="林种:"> |
112 | <el-input v-model="ruleForm.lq.lz"></el-input> | 119 | <el-select v-model="ruleForm.lq.lz"> |
120 | <el-option | ||
121 | v-for="item in dictData['A26']" | ||
122 | :key="item.dcode" | ||
123 | :label="item.dname" | ||
124 | :value="item.dcode"> | ||
125 | </el-option> | ||
126 | </el-select> | ||
113 | </el-form-item> | 127 | </el-form-item> |
114 | </el-col> | 128 | </el-col> |
115 | <el-col :span="8"> | 129 | <el-col :span="8"> |
116 | <el-form-item label="起源:"> | 130 | <el-form-item label="起源:"> |
117 | <el-input v-model="ruleForm.lq.qy"></el-input> | 131 | <el-select v-model="ruleForm.lq.lz"> |
132 | <el-option | ||
133 | v-for="item in dictData['A52']" | ||
134 | :key="item.dcode" | ||
135 | :label="item.dname" | ||
136 | :value="item.dcode"> | ||
137 | </el-option> | ||
138 | </el-select> | ||
118 | </el-form-item> | 139 | </el-form-item> |
119 | </el-col> | 140 | </el-col> |
120 | </el-row> | 141 | </el-row> | ... | ... |
... | @@ -87,7 +87,14 @@ | ... | @@ -87,7 +87,14 @@ |
87 | <el-row :gutter="10"> | 87 | <el-row :gutter="10"> |
88 | <el-col :span="8"> | 88 | <el-col :span="8"> |
89 | <el-form-item label="林地所有权性质:"> | 89 | <el-form-item label="林地所有权性质:"> |
90 | <el-input v-model="ruleForm.lq.ldsyqxz"></el-input> | 90 | <el-select v-model="ruleForm.lq.ldsyqxz"> |
91 | <el-option | ||
92 | v-for="item in dictData['A45']" | ||
93 | :key="item.dcode" | ||
94 | :label="item.dname" | ||
95 | :value="item.dcode"> | ||
96 | </el-option> | ||
97 | </el-select> | ||
91 | </el-form-item> | 98 | </el-form-item> |
92 | </el-col> | 99 | </el-col> |
93 | <el-col :span="8"> | 100 | <el-col :span="8"> |
... | @@ -109,12 +116,26 @@ | ... | @@ -109,12 +116,26 @@ |
109 | </el-col> | 116 | </el-col> |
110 | <el-col :span="8"> | 117 | <el-col :span="8"> |
111 | <el-form-item label="林种:"> | 118 | <el-form-item label="林种:"> |
112 | <el-input v-model="ruleForm.lq.lz"></el-input> | 119 | <el-select v-model="ruleForm.lq.lz"> |
120 | <el-option | ||
121 | v-for="item in dictData['A26']" | ||
122 | :key="item.dcode" | ||
123 | :label="item.dname" | ||
124 | :value="item.dcode"> | ||
125 | </el-option> | ||
126 | </el-select> | ||
113 | </el-form-item> | 127 | </el-form-item> |
114 | </el-col> | 128 | </el-col> |
115 | <el-col :span="8"> | 129 | <el-col :span="8"> |
116 | <el-form-item label="起源:"> | 130 | <el-form-item label="起源:"> |
117 | <el-input v-model="ruleForm.lq.qy"></el-input> | 131 | <el-select v-model="ruleForm.lq.lz"> |
132 | <el-option | ||
133 | v-for="item in dictData['A52']" | ||
134 | :key="item.dcode" | ||
135 | :label="item.dname" | ||
136 | :value="item.dcode"> | ||
137 | </el-option> | ||
138 | </el-select> | ||
118 | </el-form-item> | 139 | </el-form-item> |
119 | </el-col> | 140 | </el-col> |
120 | </el-row> | 141 | </el-row> | ... | ... |
... | @@ -212,7 +212,27 @@ | ... | @@ -212,7 +212,27 @@ |
212 | this.$popup("登记簿详情", "registerBook/djbFrame", { | 212 | this.$popup("登记簿详情", "registerBook/djbFrame", { |
213 | formData: param | 213 | formData: param |
214 | }) | 214 | }) |
215 | }, | ||
216 | /** | ||
217 | * @description: handleLpbClick | ||
218 | * @param {*} row | ||
219 | * @author: miaofang | ||
220 | */ | ||
221 | handleLpbClick (item) { | ||
222 | console.log("item",item); | ||
223 | console.log("this.sqywInfo",this.sqywInfo); | ||
224 | this.$popup('楼盘表', 'lpb/index', { | ||
225 | width: '85%', | ||
226 | formData: { | ||
227 | bsm: item.bsm, | ||
228 | zrzbsm: item.bsm, | ||
229 | zdbsm: item.zdbsm, | ||
230 | bsmSqyw: this.sqywInfo.bsmSqyw, | ||
231 | djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "", | ||
232 | djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "", | ||
215 | } | 233 | } |
234 | }) | ||
235 | }, | ||
216 | } | 236 | } |
217 | } | 237 | } |
218 | </script> | 238 | </script> | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-04 09:47:56 | 4 | * @LastEditTime: 2023-08-22 09:24:28 |
5 | */ | 5 | */ |
6 | import filter from '@/utils/filter.js' | 6 | import filter from '@/utils/filter.js' |
7 | let vm = null | 7 | let vm = null |
... | @@ -39,17 +39,6 @@ class data extends filter { | ... | @@ -39,17 +39,6 @@ class data extends filter { |
39 | <div> | 39 | <div> |
40 | <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a> | 40 | <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a> |
41 | <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span> | 41 | <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span> |
42 | {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a> | ||
43 | <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span> | ||
44 | <span v-show={scope.row.ycfzt == 1}>,已预查封</span> | ||
45 | <span v-show={scope.row.ycfzt == 1}>,已预查封</span> | ||
46 | <span v-show={scope.row.cfzt == 1}>,已查封</span> | ||
47 | <span v-show={scope.row.diyizt == 1}>,已地役</span> | ||
48 | <span v-show={scope.row.yyzt == 1}>,异议中</span> | ||
49 | <span v-show={scope.row.xzzt == 1}>,已限制</span> | ||
50 | <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span> | ||
51 | <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span> | ||
52 | <span v-show={scope.row.dyzt == 1}>,已抵押</span> */} | ||
53 | </div> | 42 | </div> |
54 | ) | 43 | ) |
55 | } | 44 | } |
... | @@ -67,7 +56,8 @@ class data extends filter { | ... | @@ -67,7 +56,8 @@ class data extends filter { |
67 | { | 56 | { |
68 | prop: "bdcqzh", | 57 | prop: "bdcqzh", |
69 | label: "不动产权证号", | 58 | label: "不动产权证号", |
70 | minWidth: '150' | 59 | width: '150', |
60 | showOverflowTooltip: true | ||
71 | }, | 61 | }, |
72 | { | 62 | { |
73 | prop: "gyqk", | 63 | prop: "gyqk", |
... | @@ -76,6 +66,8 @@ class data extends filter { | ... | @@ -76,6 +66,8 @@ class data extends filter { |
76 | { | 66 | { |
77 | prop: "qlrmc", | 67 | prop: "qlrmc", |
78 | label: "权利人", | 68 | label: "权利人", |
69 | width: '120', | ||
70 | showOverflowTooltip: true | ||
79 | }, | 71 | }, |
80 | { | 72 | { |
81 | prop: "qlrzjhm", | 73 | prop: "qlrzjhm", |
... | @@ -105,7 +97,7 @@ class data extends filter { | ... | @@ -105,7 +97,7 @@ class data extends filter { |
105 | render: (h, scope) => { | 97 | render: (h, scope) => { |
106 | return ( | 98 | return ( |
107 | <div> | 99 | <div> |
108 | <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button> | 100 | <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表1</el-button> |
109 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button> | 101 | <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button> |
110 | </div> | 102 | </div> |
111 | ) | 103 | ) | ... | ... |
-
Please register or sign in to post a comment