a8214033 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 8bf2d8f2 52fa86ea
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 </el-col> 145 </el-col>
146 <el-col :span="8"> 146 <el-col :span="8">
147 <el-form-item label="面积:"> 147 <el-form-item label="面积:">
148 <el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input> 148 <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
149 </el-form-item> 149 </el-form-item>
150 </el-col> 150 </el-col>
151 <el-col :span="8"> 151 <el-col :span="8">
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 </div> 46 </div>
47 <el-row :gutter="10"> 47 <el-row :gutter="10">
48 <el-col :span="8"> 48 <el-col :span="8">
49 <el-form-item label="抵押不动产信息:"> 49 <el-form-item label="抵押不动产信息:" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules">
50 <select-table 50 <select-table
51 v-model="ruleForm.ztQlxx" 51 v-model="ruleForm.ztQlxx"
52 :table-width="550" 52 :table-width="550"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 </el-col> 142 </el-col>
143 <el-col :span="8"> 143 <el-col :span="8">
144 <el-form-item label="面积:"> 144 <el-form-item label="面积:">
145 <el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input> 145 <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
146 </el-form-item> 146 </el-form-item>
147 </el-col> 147 </el-col>
148 <el-col :span="8"> 148 <el-col :span="8">
...@@ -263,23 +263,25 @@ ...@@ -263,23 +263,25 @@
263 <el-row :gutter="10"> 263 <el-row :gutter="10">
264 <el-col :span="8"> 264 <el-col :span="8">
265 <el-form-item label="抵押面积:"> 265 <el-form-item label="抵押面积:">
266 <div style="display: flex"> 266 <div class="flex">
267 <el-input 267 <el-input
268 v-model="ruleForm.diyaq.dymj" 268 v-model="ruleForm.diyaq.dymj"
269 style="width: 500%" 269 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
270 oninput="value=value.replace(/[^\d.]/g,'')" 270 <el-select
271 ></el-input> 271 v-model="ruleForm.diyaq.jedw"
272 <el-select v-model="ruleForm.diyaq.mjdw"> 272 :disabled="!ableOperation"
273 <el-option 273 style="width: 20%">
274 v-for="item in dictData['A7']" 274 <el-option
275 :key="item.dcode" 275 v-for="item in dictData['A7']"
276 :label="item.dname" 276 :key="item.dcode"
277 :value="item.dcode" 277 :label="item.dname"
278 ></el-option> 278 :value="item.dcode">
279 </el-select> 279 </el-option>
280 </div> 280 </el-select>
281 </div>
281 </el-form-item> 282 </el-form-item>
282 </el-col> 283 </el-col>
284
283 <el-col :span="8"> 285 <el-col :span="8">
284 <el-form-item 286 <el-form-item
285 label="债务履行起始时间:" 287 label="债务履行起始时间:"
...@@ -553,6 +555,7 @@ export default { ...@@ -553,6 +555,7 @@ export default {
553 }, 555 },
554 data() { 556 data() {
555 return { 557 return {
558 mjdw:"1",
556 props: { 559 props: {
557 label: "bdcqzh", 560 label: "bdcqzh",
558 value: "bdcdyid", 561 value: "bdcdyid",
...@@ -608,6 +611,9 @@ export default { ...@@ -608,6 +611,9 @@ export default {
608 ztQlxxList: [], 611 ztQlxxList: [],
609 ableOperation: false, 612 ableOperation: false,
610 rules: { 613 rules: {
614 ztQlxxrules: [
615 { required: true, message: "抵押不动产信息", trigger: "change" },
616 ],
611 bdcqzhrules: [ 617 bdcqzhrules: [
612 { required: true, message: "不动产登记证明号", trigger: "blur" }, 618 { required: true, message: "不动产登记证明号", trigger: "blur" },
613 ], 619 ],
...@@ -626,10 +632,10 @@ export default { ...@@ -626,10 +632,10 @@ export default {
626 zxdbrrules: [ 632 zxdbrrules: [
627 { required: true, message: "注销登簿人", trigger: "blur" }, 633 { required: true, message: "注销登簿人", trigger: "blur" },
628 ], 634 ],
629 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }], 635 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
630 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }], 636 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
631 djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }], 637 djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
632 djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }], 638 djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
633 }, 639 },
634 }; 640 };
635 }, 641 },
......
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
198 <el-input 198 <el-input
199 v-model="ruleForm.tdsyq.cdmj" 199 v-model="ruleForm.tdsyq.cdmj"
200 :disabled="!ableOperation" 200 :disabled="!ableOperation"
201 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" 201 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
202 ></el-input> 202 ></el-input>
203 </el-form-item> 203 </el-form-item>
204 </el-col> 204 </el-col>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 预告登记信息 45 预告登记信息
46 <div class="triangle"></div> 46 <div class="triangle"></div>
47 </div> 47 </div>
48 <el-row :gutter="10" class="ssqlxx"> 48 <el-row :gutter="10" class="ssqlxx">
49 <el-col :span="24" v-if="ssqlxxshow"> 49 <el-col :span="24" v-if="ssqlxxshow">
50 <el-form-item label="上手权利信息:"> 50 <el-form-item label="上手权利信息:">
51 <select-table 51 <select-table
......
...@@ -16,9 +16,9 @@ export function getForm(tabName) { ...@@ -16,9 +16,9 @@ export function getForm(tabName) {
16 case "jsydsyq": 16 case "jsydsyq":
17 form = require("@/views/registerBook/jsydsyq.vue"); 17 form = require("@/views/registerBook/jsydsyq.vue");
18 break; 18 break;
19 case "tdsyq": 19 case "tdsyq":
20 form = require("@/views/registerBook/tdsyq.vue"); 20 form = require("@/views/registerBook/tdsyq.vue");
21 break; 21 break;
22 case "nydsyq": 22 case "nydsyq":
23 form = require("@/views/registerBook/nydsyq.vue"); 23 form = require("@/views/registerBook/nydsyq.vue");
24 break; 24 break;
...@@ -46,17 +46,20 @@ export function getForm(tabName) { ...@@ -46,17 +46,20 @@ export function getForm(tabName) {
46 case "slxxjsydsyq": 46 case "slxxjsydsyq":
47 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue"); 47 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue");
48 break; 48 break;
49 case "slxxtdsyq": 49 case "slxxtdsyq":
50 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue"); 50 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue");
51 break; 51 break;
52 case "slxxfdcq": 52 case "slxxfdcq":
53 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue"); 53 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue");
54 break; 54 break;
55 case "slxxdyaq": 55 case "slxxdyaq":
56 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue"); 56 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue");
57 break; 57 break;
58 case "slxxygdj": 58 case "slxxygdydj":
59 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue"); 59 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/ygdydj.vue");
60 break;
61 case "slxxygmmdj":
62 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/ygmmdj.vue");
60 break; 63 break;
61 case "slxxyydj": 64 case "slxxyydj":
62 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue"); 65 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue");
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 09:52:37
5 -->
6 <template>
7 <div class="djxxTable">
8 <div class="tableBox">
9 <div class="title">
10 {{ title }}
11 <div class="checkbox">
12 <el-radio-group v-model="radio" :change="checkChange()">
13 <el-radio :label="1">所有数据</el-radio>
14 <el-radio :label="2">只展示变化数据</el-radio>
15 </el-radio-group>
16 </div>
17 </div>
18 <div class="xxTableBox rollTable">
19 <table class="xxTable">
20 <tr v-for="(item, colindex) in columns" :key="colindex">
21 <td>
22 {{ item.label }}
23 </td>
24 <td></td>
25 <td v-for="count in emptycolNum" :key="~count"></td>
26 </tr>
27 </table>
28 </div>
29 </div>
30 </div>
31 </template>
32
33 <script>
34 import { datas } from "./qlxxFormData.js";
35 import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
36 import { getDiyiqList } from "@/api/djbDetail.js";
37 export default {
38 props: {
39 formData: {
40 type: Object,
41 default: {},
42 },
43 },
44 data() {
45 return {
46 radio: 1,
47 title: "变化情况对比",
48 //列表数据
49 tableData: [],
50 //空列值个数
51 emptycolNum: 1,
52 //列名称对象
53 columns: datas.columns().DYIQ,
54 };
55 },
56 created() {
57 console.log("this.formData", this.formData);
58 },
59 methods: {
60 /**
61 * @description: checkChange
62 * @author: renchao
63 */
64 checkChange() {
65 console.log("ssss",this.radio);
66 },
67 },
68 };
69 </script>
70
71 <style lang="scss" scoped>
72 @import "./qlxxCommon.scss";
73 </style>
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
79 ywly: "" 79 ywly: ""
80 } 80 }
81 if (this.queryForm) { 81 if (this.queryForm) {
82 this.$startLoading();
82 searchTaskToDo({ 83 searchTaskToDo({
83 ...this.queryForm, 84 ...this.queryForm,
84 }).then((res) => { 85 }).then((res) => {
...@@ -86,6 +87,7 @@ ...@@ -86,6 +87,7 @@
86 let { records } = res.result; 87 let { records } = res.result;
87 88
88 this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid); 89 this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
90 this.$endLoading();
89 } 91 }
90 }); 92 });
91 } 93 }
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 </el-col> 94 </el-col>
95 <el-col :span="8"> 95 <el-col :span="8">
96 <el-form-item label="面积:"> 96 <el-form-item label="面积:">
97 <el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input> 97 <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
98 </el-form-item> 98 </el-form-item>
99 </el-col> 99 </el-col>
100 <el-col :span="8"> 100 <el-col :span="8">
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 <el-input 100 <el-input
101 v-model="ruleForm.tdsyq.nydmj" 101 v-model="ruleForm.tdsyq.nydmj"
102 :disabled="!ableOperation" 102 :disabled="!ableOperation"
103 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 103 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
104 <el-select 104 <el-select
105 v-model="mjdw" 105 v-model="mjdw"
106 :disabled="!ableOperation" 106 :disabled="!ableOperation"
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 <el-input 121 <el-input
122 v-model="ruleForm.tdsyq.gdmj" 122 v-model="ruleForm.tdsyq.gdmj"
123 :disabled="!ableOperation" 123 :disabled="!ableOperation"
124 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 124 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
125 <el-select 125 <el-select
126 v-model="mjdw" 126 v-model="mjdw"
127 :disabled="!ableOperation" 127 :disabled="!ableOperation"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 <el-input 142 <el-input
143 v-model="ruleForm.tdsyq.ldmj" 143 v-model="ruleForm.tdsyq.ldmj"
144 :disabled="!ableOperation" 144 :disabled="!ableOperation"
145 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 145 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
146 <el-select 146 <el-select
147 v-model="mjdw" 147 v-model="mjdw"
148 :disabled="!ableOperation" 148 :disabled="!ableOperation"
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
165 <el-input 165 <el-input
166 v-model="ruleForm.tdsyq.cdmj" 166 v-model="ruleForm.tdsyq.cdmj"
167 :disabled="!ableOperation" 167 :disabled="!ableOperation"
168 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 168 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
169 <el-select 169 <el-select
170 v-model="mjdw" 170 v-model="mjdw"
171 :disabled="!ableOperation" 171 :disabled="!ableOperation"
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
186 <el-input 186 <el-input
187 v-model="ruleForm.tdsyq.qtnydmj" 187 v-model="ruleForm.tdsyq.qtnydmj"
188 :disabled="!ableOperation" 188 :disabled="!ableOperation"
189 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 189 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
190 <el-select 190 <el-select
191 v-model="mjdw" 191 v-model="mjdw"
192 :disabled="!ableOperation" 192 :disabled="!ableOperation"
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
207 <el-input 207 <el-input
208 v-model="ruleForm.tdsyq.jsydmj" 208 v-model="ruleForm.tdsyq.jsydmj"
209 :disabled="!ableOperation" 209 :disabled="!ableOperation"
210 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 210 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
211 <el-select 211 <el-select
212 v-model="mjdw" 212 v-model="mjdw"
213 :disabled="!ableOperation" 213 :disabled="!ableOperation"
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
230 <el-input 230 <el-input
231 v-model="ruleForm.tdsyq.wlydmj" 231 v-model="ruleForm.tdsyq.wlydmj"
232 :disabled="!ableOperation" 232 :disabled="!ableOperation"
233 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 233 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
234 <el-select 234 <el-select
235 v-model="mjdw" 235 v-model="mjdw"
236 :disabled="!ableOperation" 236 :disabled="!ableOperation"
......
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
148 flex: 1; 148 flex: 1;
149 width: 100%; 149 width: 100%;
150 padding: 3px; 150 padding: 3px;
151 151 font-size: 16px;
152 } 152 }
153 153
154 p:nth-child(2) { 154 p:nth-child(2) {
......