efb0088c by renchao@pashanhoo.com

Merge branch 'dev'

2 parents d3e87ac7 e8c11b93
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @Author: sakuya 4 * @Author: sakuya
5 * @Date: 2021年6月10日10:04:07 5 * @Date: 2021年6月10日10:04:07
6 * @LastEditors: Please set LastEditors 6 * @LastEditors: Please set LastEditors
7 * @LastEditTime: 2023-07-28 09:49:26 7 * @LastEditTime: 2023-11-07 10:04:18
8 --> 8 -->
9 9
10 <template> 10 <template>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled" 12 :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled"
13 @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear"> 13 @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
14 <template #empty> 14 <template #empty>
15 <div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading"> 15 <div class="sc-table-select__table" :style="{width: '100%'}" v-loading="loading">
16 <div class="sc-table-select__header"> 16 <div class="sc-table-select__header">
17 <slot name="header" :form="formData" :submit="formSubmit"></slot> 17 <slot name="header" :form="formData" :submit="formSubmit"></slot>
18 </div> 18 </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 :show-message="false" 4 :show-message="false"
5 * @LastEditTime: 2023-11-03 14:46:48 5 * @LastEditTime: 2023-11-07 09:25:19
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
49 :rules="rules.ztQlxxrules"> 49 :rules="rules.ztQlxxrules">
50 <select-table 50 <select-table
51 v-model="ruleForm.ztQlxx" 51 v-model="ruleForm.ztQlxx"
52 :table-width="730"
53 :tableData="ztQlxxList" 52 :tableData="ztQlxxList"
54 :props="props" 53 :props="props"
55 @change="ztQlxxchange"> 54 @change="ztQlxxchange">
...@@ -138,7 +137,6 @@ ...@@ -138,7 +137,6 @@
138 v-if="ruleForm.qlxx.djlx == '300'"> 137 v-if="ruleForm.qlxx.djlx == '300'">
139 <select-table 138 <select-table
140 v-model="ruleForm.ssQlxx" 139 v-model="ruleForm.ssQlxx"
141 :table-width="730"
142 :tableData="ssQlxxList" 140 :tableData="ssQlxxList"
143 :props="props" 141 :props="props"
144 @change="ssQlxxchange"> 142 @change="ssQlxxchange">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-03 14:54:52 4 * @LastEditTime: 2023-11-07 10:04:24
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
49 :rules="rules.ztQlxxrules"> 49 :rules="rules.ztQlxxrules">
50 <select-table 50 <select-table
51 v-model="ruleForm.ztQlxx" 51 v-model="ruleForm.ztQlxx"
52 table-width="100%"
53 :tableData="ztQlxxList" 52 :tableData="ztQlxxList"
54 :props="props" 53 :props="props"
55 @change="ztQlxxchange"> 54 @change="ztQlxxchange">
...@@ -132,7 +131,6 @@ ...@@ -132,7 +131,6 @@
132 :rules="rules.ssQlxxrules"> 131 :rules="rules.ssQlxxrules">
133 <select-table 132 <select-table
134 v-model="ruleForm.ssQlxx" 133 v-model="ruleForm.ssQlxx"
135 :table-width="730"
136 :tableData="ssQlxxList" 134 :tableData="ssQlxxList"
137 :props="props" 135 :props="props"
138 @change="ssQlxxchange"> 136 @change="ssQlxxchange">
...@@ -383,7 +381,7 @@ ...@@ -383,7 +381,7 @@
383 type="date" 381 type="date"
384 class="width100" 382 class="width100"
385 placeholder="选择日期" 383 placeholder="选择日期"
386 value-format="yyyy-MM-dd HH:mm:ss" 384 value-format="yyyy-MM-dd"
387 format="yyyy-MM-dd"> 385 format="yyyy-MM-dd">
388 </el-date-picker> 386 </el-date-picker>
389 </el-form-item> 387 </el-form-item>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-26 13:26:40 4 * @LastEditTime: 2023-11-07 09:25:27
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
43 <div class="count"> 43 <div class="count">
44 <el-form-item 44 <el-form-item
45 label="地役权不动产情况" 45 label="地役权不动产情况"
46 style="display:flex"
46 prop="ztQlxx.bdcqzh" 47 prop="ztQlxx.bdcqzh"
47 :rules="rules.ztQlxxrules"> 48 :rules="rules.ztQlxxrules">
48 <select-table 49 <select-table
49 v-model="ruleForm.ztQlxx" 50 v-model="ruleForm.ztQlxx"
50 :table-width="730"
51 :tableData="ztQlxxList" 51 :tableData="ztQlxxList"
52 :props="props" 52 :props="props"
53 @change="ztQlxxchange"> 53 @change="ztQlxxchange">
...@@ -130,7 +130,6 @@ ...@@ -130,7 +130,6 @@
130 :rules="rules.ssQlxxrules"> 130 :rules="rules.ssQlxxrules">
131 <select-table 131 <select-table
132 v-model="ruleForm.ssQlxx" 132 v-model="ruleForm.ssQlxx"
133 :table-width="730"
134 :tableData="ssQlxxList" 133 :tableData="ssQlxxList"
135 :props="props" 134 :props="props"
136 @change="ssQlxxchange"> 135 @change="ssQlxxchange">
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
48 :rules="rules.ssQlxxrules"> 48 :rules="rules.ssQlxxrules">
49 <select-table 49 <select-table
50 v-model="ruleForm.ssQlxx" 50 v-model="ruleForm.ssQlxx"
51 :table-width="730"
52 :tableData="ssQlxxList" 51 :tableData="ssQlxxList"
53 :props="props" 52 :props="props"
54 @change="ssQlxxchange"> 53 @change="ssQlxxchange">
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
45 :rules="rules.ssQlxxrules"> 45 :rules="rules.ssQlxxrules">
46 <select-table 46 <select-table
47 v-model="ruleForm.ssQlxx" 47 v-model="ruleForm.ssQlxx"
48 :table-width="730"
49 :tableData="ssQlxxList" 48 :tableData="ssQlxxList"
50 :props="props" 49 :props="props"
51 @change="ssQlxxchange"> 50 @change="ssQlxxchange">
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
47 :rules="rules.ssQlxxrules"> 47 :rules="rules.ssQlxxrules">
48 <select-table 48 <select-table
49 v-model="ruleForm.ssQlxx" 49 v-model="ruleForm.ssQlxx"
50 :table-width="730"
51 :tableData="ssQlxxList" 50 :tableData="ssQlxxList"
52 :props="props" 51 :props="props"
53 @change="ssQlxxchange"> 52 @change="ssQlxxchange">
......
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
44 <el-form-item 44 <el-form-item
45 label="上手权利信息:" 45 label="上手权利信息:"
46 prop="ssQlxx.bdcqzh" 46 prop="ssQlxx.bdcqzh"
47 style="display:flex"
47 :rules="rules.ssQlxxrules"> 48 :rules="rules.ssQlxxrules">
48 <select-table 49 <select-table
49 v-model="ruleForm.ssQlxx" 50 v-model="ruleForm.ssQlxx"
50 :table-width="730"
51 :tableData="ssQlxxList" 51 :tableData="ssQlxxList"
52 :props="props" 52 :props="props"
53 @change="ssQlxxchange"> 53 @change="ssQlxxchange">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-02 13:27:43 4 * @LastEditTime: 2023-11-07 09:26:12
5 :show-message="false" 5 :show-message="false"
6 --> 6 -->
7 <template> 7 <template>
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
45 <div class="count"> 45 <div class="count">
46 <el-form-item 46 <el-form-item
47 label="预告买卖登记" 47 label="预告买卖登记"
48 style="display:flex"
48 prop="ztQlxx.bdcqzh" 49 prop="ztQlxx.bdcqzh"
49 :rules="rules.ztQlxxrules"> 50 :rules="rules.ztQlxxrules">
50 <select-table 51 <select-table
51 v-model="ruleForm.ztQlxx" 52 v-model="ruleForm.ztQlxx"
52 table-width="100%"
53 :tableData="ztQlxxList" 53 :tableData="ztQlxxList"
54 :props="props" 54 :props="props"
55 @change="ztQlxxchange"> 55 @change="ztQlxxchange">
...@@ -127,10 +127,10 @@ ...@@ -127,10 +127,10 @@
127 <el-form-item 127 <el-form-item
128 label="上手权利信息:" 128 label="上手权利信息:"
129 prop="ssQlxx.bdcqzh" 129 prop="ssQlxx.bdcqzh"
130
130 :rules="rules.ssQlxxrules"> 131 :rules="rules.ssQlxxrules">
131 <select-table 132 <select-table
132 v-model="ruleForm.ssQlxx" 133 v-model="ruleForm.ssQlxx"
133 table-width="100%"
134 :tableData="ssQlxxList" 134 :tableData="ssQlxxList"
135 :props="props" 135 :props="props"
136 @change="ssQlxxchange"> 136 @change="ssQlxxchange">
...@@ -172,13 +172,13 @@ ...@@ -172,13 +172,13 @@
172 </el-col> 172 </el-col>
173 </el-row> 173 </el-row>
174 <el-row :gutter="10"> 174 <el-row :gutter="10">
175 175
176 <el-col :span="8"> 176 <el-col :span="8">
177 <el-form-item label="权利类型:"> 177 <el-form-item label="权利类型:">
178 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 178 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
179 </el-form-item> 179 </el-form-item>
180 </el-col> 180 </el-col>
181 <el-col :span="8"> 181 <el-col :span="8">
182 <el-form-item 182 <el-form-item
183 label="登记类型:" 183 label="登记类型:"
184 prop="qlxx.djlx" 184 prop="qlxx.djlx"
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
193 </el-select> 193 </el-select>
194 </el-form-item> 194 </el-form-item>
195 </el-col> 195 </el-col>
196 <el-col :span="8"> 196 <el-col :span="8">
197 <el-form-item 197 <el-form-item
198 label="预告登记种类:" 198 label="预告登记种类:"
199 prop="ygdj.ygdjzl" 199 prop="ygdj.ygdjzl"
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
208 </el-select> 208 </el-select>
209 </el-form-item> 209 </el-form-item>
210 </el-col> 210 </el-col>
211 211
212 <el-col :span="8"> 212 <el-col :span="8">
213 <el-form-item> 213 <el-form-item>
214 <span slot="label" style="display: inline-block"> 214 <span slot="label" style="display: inline-block">
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
250 </el-date-picker> 250 </el-date-picker>
251 </el-form-item> 251 </el-form-item>
252 </el-col> 252 </el-col>
253 <el-col :span="8"> 253 <el-col :span="8">
254 <el-form-item label="债务履行结束时间:"> 254 <el-form-item label="债务履行结束时间:">
255 <el-date-picker 255 <el-date-picker
256 v-model="ruleForm.qlxx.zwlxjssj" 256 v-model="ruleForm.qlxx.zwlxjssj"
...@@ -261,18 +261,18 @@ ...@@ -261,18 +261,18 @@
261 format="yyyy-MM-dd"> 261 format="yyyy-MM-dd">
262 </el-date-picker> 262 </el-date-picker>
263 </el-form-item> 263 </el-form-item>
264 </el-col> 264 </el-col>
265 <el-col :span="8"> 265 <el-col :span="8">
266 <el-form-item label="债务履行期限:"> 266 <el-form-item label="债务履行期限:">
267 <el-input v-model="ruleForm.ygdj.dyqx"></el-input> 267 <el-input v-model="ruleForm.ygdj.dyqx"></el-input>
268 </el-form-item> 268 </el-form-item>
269 </el-col> 269 </el-col>
270 <el-col :span="8"> 270 <el-col :span="8">
271 <el-form-item label="不动产坐落:"> 271 <el-form-item label="不动产坐落:">
272 <el-input v-model="ruleForm.qlxx.zl"></el-input> 272 <el-input v-model="ruleForm.qlxx.zl"></el-input>
273 </el-form-item> 273 </el-form-item>
274 </el-col> 274 </el-col>
275 <el-col :span="8"> 275 <el-col :span="8">
276 <el-form-item 276 <el-form-item
277 label="登记机构:" 277 label="登记机构:"
278 prop="qlxx.djjg" 278 prop="qlxx.djjg"
...@@ -280,13 +280,13 @@ ...@@ -280,13 +280,13 @@
280 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 280 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
281 </el-form-item> 281 </el-form-item>
282 </el-col> 282 </el-col>
283 283
284 <!-- <el-col :span="8"> 284 <!-- <el-col :span="8">
285 <el-form-item label="区县代码:" prop="qlxx.qxdm" :rules="rules.qxdmrules"> 285 <el-form-item label="区县代码:" prop="qlxx.qxdm" :rules="rules.qxdmrules">
286 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 286 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
287 </el-form-item> 287 </el-form-item>
288 </el-col> --> 288 </el-col> -->
289 289
290 <el-col :span="8"> 290 <el-col :span="8">
291 <el-form-item 291 <el-form-item
292 label="登簿人:" 292 label="登簿人:"
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
310 </el-date-picker> 310 </el-date-picker>
311 </el-form-item> 311 </el-form-item>
312 </el-col> 312 </el-col>
313 <el-col :span="8"> 313 <el-col :span="8">
314 <el-form-item label="不动产登记证明号:" prop="qlxx.bdcqzh" 314 <el-form-item label="不动产登记证明号:" prop="qlxx.bdcqzh"
315 :rules="rules.bdcqzhrules"> 315 :rules="rules.bdcqzhrules">
316 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 316 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
321 <el-input v-model="ruleForm.ygdj.djyy"></el-input> 321 <el-input v-model="ruleForm.ygdj.djyy"></el-input>
322 </el-form-item> 322 </el-form-item>
323 </el-col> 323 </el-col>
324 <el-col :span="24"> 324 <el-col :span="24">
325 <el-form-item label="附记:"> 325 <el-form-item label="附记:">
326 <el-input v-model="ruleForm.ygdj.fj" type="textarea" maxlength="500" show-word-limit></el-input> 326 <el-input v-model="ruleForm.ygdj.fj" type="textarea" maxlength="500" show-word-limit></el-input>
327 </el-form-item> 327 </el-form-item>
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
338 </el-select> 338 </el-select>
339 </el-form-item> 339 </el-form-item>
340 </el-col> 340 </el-col>
341 <el-col :span="8"> 341 <el-col :span="8">
342 <el-form-item label="担保范围:"> 342 <el-form-item label="担保范围:">
343 <el-input maxlength="10" v-model="ruleForm.ygdj.dbfw"></el-input> 343 <el-input maxlength="10" v-model="ruleForm.ygdj.dbfw"></el-input>
344 </el-form-item> 344 </el-form-item>
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
376 </el-date-picker> 376 </el-date-picker>
377 </el-form-item> 377 </el-form-item>
378 </el-col> 378 </el-col>
379 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 379 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
380 <el-form-item label="注销登簿人:"> 380 <el-form-item label="注销登簿人:">
381 <el-input v-model="ruleForm.qlxx.zxdbr"></el-input> 381 <el-input v-model="ruleForm.qlxx.zxdbr"></el-input>
382 </el-form-item> 382 </el-form-item>
......
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
45 <div class="count" v-if="ssqlxxshow"> 45 <div class="count" v-if="ssqlxxshow">
46 <el-form-item 46 <el-form-item
47 label="上手权利信息:" 47 label="上手权利信息:"
48 style="display:flex"
48 prop="ssQlxx.bdcqzh" 49 prop="ssQlxx.bdcqzh"
49 :rules="rules.ssQlxxrules"> 50 :rules="rules.ssQlxxrules">
50 <select-table 51 <select-table
51 v-model="ruleForm.ssQlxx" 52 v-model="ruleForm.ssQlxx"
52 :table-width="730"
53 :tableData="ssQlxxList" 53 :tableData="ssQlxxList"
54 :props="props" 54 :props="props"
55 @change="ssQlxxchange"> 55 @change="ssQlxxchange">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-08 09:35:26 4 * @LastEditTime: 2023-11-07 09:26:20
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -44,11 +44,11 @@ ...@@ -44,11 +44,11 @@
44 <div class="count"> 44 <div class="count">
45 <el-form-item 45 <el-form-item
46 label="抵押不动产信息:" 46 label="抵押不动产信息:"
47 style="display:flex"
47 prop="ztQlxx.bdcqzh" 48 prop="ztQlxx.bdcqzh"
48 :rules="rules.ztQlxxrules"> 49 :rules="rules.ztQlxxrules">
49 <select-table 50 <select-table
50 v-model="ruleForm.ztQlxx" 51 v-model="ruleForm.ztQlxx"
51 :table-width="550"
52 :tableData="ztQlxxList" 52 :tableData="ztQlxxList"
53 :props="props" 53 :props="props"
54 @change="ztQlxxchange"> 54 @change="ztQlxxchange">
...@@ -125,11 +125,11 @@ ...@@ -125,11 +125,11 @@
125 <div class="count" v-if="ssqlxxshow"> 125 <div class="count" v-if="ssqlxxshow">
126 <el-form-item 126 <el-form-item
127 label="上手权利信息:" 127 label="上手权利信息:"
128 style="display:flex"
128 prop="ssQlxx.bdcqzh" 129 prop="ssQlxx.bdcqzh"
129 :rules="rules.ssQlxxrules"> 130 :rules="rules.ssQlxxrules">
130 <select-table 131 <select-table
131 v-model="ruleForm.ssQlxx" 132 v-model="ruleForm.ssQlxx"
132 :table-width="550"
133 :tableData="ssQlxxList" 133 :tableData="ssQlxxList"
134 :props="props" 134 :props="props"
135 @change="ssQlxxchange"> 135 @change="ssQlxxchange">
......