30b28f34 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 158ed347 8acb0551
...@@ -761,7 +761,7 @@ class data extends filter { ...@@ -761,7 +761,7 @@ class data extends filter {
761 }, 761 },
762 { 762 {
763 prop: "bdbzzqse", 763 prop: "bdbzzqse",
764 label: "被担保主债权数额(万元)", 764 label: "被担保主债权数额",
765 }, 765 },
766 { 766 {
767 prop: "dbfw", 767 prop: "dbfw",
...@@ -776,7 +776,7 @@ class data extends filter { ...@@ -776,7 +776,7 @@ class data extends filter {
776 label: "债务履行结束时间", 776 label: "债务履行结束时间",
777 }, 777 },
778 { 778 {
779 prop: "zwlxqx", 779 prop: "dyqx",
780 label: "债务履行期限(债务确定期间)", 780 label: "债务履行期限(债务确定期间)",
781 }, 781 },
782 { 782 {
...@@ -784,7 +784,7 @@ class data extends filter { ...@@ -784,7 +784,7 @@ class data extends filter {
784 label: "最高债权确定事实和数额", 784 label: "最高债权确定事实和数额",
785 }, 785 },
786 { 786 {
787 prop: "sfczyd", 787 prop: "sfczjzhxz",
788 label: "是否存在禁止或限制转让抵押不动产的约定", 788 label: "是否存在禁止或限制转让抵押不动产的约定",
789 }, 789 },
790 { 790 {
...@@ -1017,7 +1017,7 @@ class data extends filter { ...@@ -1017,7 +1017,7 @@ class data extends filter {
1017 label: "附记", 1017 label: "附记",
1018 }, 1018 },
1019 { 1019 {
1020 prop: "qdjgmc", 1020 prop: "qdjg",
1021 label: "取得价格/被担保主债权数额", 1021 label: "取得价格/被担保主债权数额",
1022 }, 1022 },
1023 { 1023 {
...@@ -1025,7 +1025,7 @@ class data extends filter { ...@@ -1025,7 +1025,7 @@ class data extends filter {
1025 label: "担保范围", 1025 label: "担保范围",
1026 }, 1026 },
1027 { 1027 {
1028 prop: "sfczyd", 1028 prop: "sfczjzhxz",
1029 label: "是否存在禁止或限制转让抵押不动产的约定", 1029 label: "是否存在禁止或限制转让抵押不动产的约定",
1030 }, 1030 },
1031 { 1031 {
......
...@@ -171,6 +171,8 @@ ...@@ -171,6 +171,8 @@
171 if (['zsdy', 'zmdy'].includes(that.ruleForm.tmpno)) { 171 if (['zsdy', 'zmdy'].includes(that.ruleForm.tmpno)) {
172 LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4"); // 设置纸张大小为 B4 172 LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4"); // 设置纸张大小为 B4
173 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向 173 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
174 } else {
175 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 B4
174 } 176 }
175 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板 177 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
176 //窗口关闭后,回调函数中保存的设计代码 178 //窗口关闭后,回调函数中保存的设计代码
......
...@@ -100,12 +100,12 @@ ...@@ -100,12 +100,12 @@
100 </el-form-item> 100 </el-form-item>
101 </el-col> 101 </el-col>
102 <el-col :span="8"> 102 <el-col :span="8">
103 <el-form-item label="面积:"> 103 <el-form-item label="权利性质:">
104 <el-input disabled v-model="ruleForm.ztQlxx.qlmjmc"></el-input> 104 <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
105 </el-form-item> 105 </el-form-item>
106 </el-col> 106 </el-col>
107 <el-col :span="8"> 107 <el-col :span="8">
108 <el-form-item label="用途:"> 108 <el-form-item label="权利用途:">
109 <el-input disabled v-model="ruleForm.ztQlxx.qlytmc"></el-input> 109 <el-input disabled v-model="ruleForm.ztQlxx.qlytmc"></el-input>
110 </el-form-item> 110 </el-form-item>
111 </el-col> 111 </el-col>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input> 122 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
123 </el-form-item> 123 </el-form-item>
124 </el-col> 124 </el-col>
125 <el-col :span="7"> 125 <el-col :span="8">
126 <el-form-item label="抵押方式:"> 126 <el-form-item label="抵押方式:">
127 <el-radio-group disabled v-model="ruleForm.diyaq.dyfs"> 127 <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
128 <el-radio label="1">一般抵押权</el-radio> 128 <el-radio label="1">一般抵押权</el-radio>
...@@ -130,20 +130,58 @@ ...@@ -130,20 +130,58 @@
130 </el-radio-group> 130 </el-radio-group>
131 </el-form-item> 131 </el-form-item>
132 </el-col> 132 </el-col>
133 <el-col :span="9"> 133 <el-col :span="8">
134 <el-form-item label="抵押面积:">
135 <div class="flex">
136 <el-input
137 maxlength="12"
138 v-model="ruleForm.diyaq.dymj"
139 disabled></el-input>
140 <el-select disabled v-model="ruleForm.diyaq.mjdw" style="width: 68px">
141 <el-option
142 v-for="item in dictData['A7']"
143 :key="item.dcode"
144 :label="item.dname"
145 :value="item.dcode">
146 </el-option>
147 </el-select>
148 </div>
149 </el-form-item>
150 </el-col>
151 </el-row>
152 <el-row :gutter="10">
153 <el-col :span="8">
134 <el-form-item 154 <el-form-item
135 label="是否存在禁止或者限制转让抵押不动产的约定:" 155 label="是否禁止或者限制转让的约定:"
136 label-width="350px" 156 label-width="200px"
137 > 157 >
138 <el-radio-group 158 <el-radio-group
139 v-model="ruleForm.diyaq.sfczjzhxz" 159 v-model="ruleForm.diyaq.sfczjzhxz"
140 :disabled="!viewEdit || isJfOperation" 160 :disabled="!viewEdit || isJfOperation"
141 > 161 >
142 <el-radio label="1">启用</el-radio> 162 <el-radio label="1"></el-radio>
143 <el-radio label="0">禁用</el-radio> 163 <el-radio label="0"></el-radio>
164 </el-radio-group>
165 </el-form-item>
166 </el-col>
167 <el-col :span="8">
168 <el-form-item
169 label="是否预告登记:"
170 >
171 <el-radio-group v-model="ruleForm.diyaq.sfygdj" disabled>
172 <el-radio label="1"></el-radio>
173 <el-radio label="0"></el-radio>
144 </el-radio-group> 174 </el-radio-group>
145 </el-form-item> 175 </el-form-item>
146 </el-col> 176 </el-col>
177 <el-col :span="8">
178 <el-form-item label="债务履行期限:">
179 <el-input
180 v-model="ruleForm.diyaq.dyqx"
181 :disabled="!viewEdit || isJfOperation"
182 ></el-input>
183 </el-form-item>
184 </el-col>
147 </el-row> 185 </el-row>
148 186
149 <el-row :gutter="10"> 187 <el-row :gutter="10">
...@@ -366,7 +404,6 @@ export default { ...@@ -366,7 +404,6 @@ export default {
366 if (res.code === 200 && res.result) { 404 if (res.code === 200 && res.result) {
367 this.ruleForm = res.result; 405 this.ruleForm = res.result;
368 this.czrOptions = this.ruleForm.qlrList; 406 this.czrOptions = this.ruleForm.qlrList;
369 this.ruleForm.diyaq.sfczjzhxz = "0";
370 } 407 }
371 this.ruleForm.qlrList.forEach((item) => { 408 this.ruleForm.qlrList.forEach((item) => {
372 if (item.sfczr == 1) { 409 if (item.sfczr == 1) {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 ref="ruleForm" 8 ref="ruleForm"
9 :label-position="flag ? 'top' : ''" 9 :label-position="flag ? 'top' : ''"
10 :inline="flag" 10 :inline="flag"
11 label-width="120px"> 11 label-width="140px">
12 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''"> 12 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
13 <div class="slxx_title title-block"> 13 <div class="slxx_title title-block">
14 申请业务信息 14 申请业务信息
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
61 <el-col :span="8"> 61 <el-col :span="8">
62 <el-form-item label="不动产登记证明号:"> 62 <el-form-item label="不动产证明号:">
63 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input> 63 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
...@@ -131,12 +131,21 @@ ...@@ -131,12 +131,21 @@
131 </el-form-item> 131 </el-form-item>
132 </el-col> 132 </el-col>
133 <el-col :span="8"> 133 <el-col :span="8">
134 <el-form-item label="是否存在禁止或限制:"> 134 <el-form-item
135 <el-input 135 label="是否禁止或者限制转让的约定:"
136 label-width="200px"
137 >
138 <el-radio-group
136 v-model="ruleForm.ygdj.sfczjzhxz" 139 v-model="ruleForm.ygdj.sfczjzhxz"
137 :disabled="ruleForm.sldy.djlx == '300' && !viewEdit"></el-input> 140 :disabled="!viewEdit || isJfOperation"
141 >
142 <el-radio label="1"></el-radio>
143 <el-radio label="0"></el-radio>
144 </el-radio-group>
138 </el-form-item> 145 </el-form-item>
139 </el-col> 146 </el-col>
147 </el-row>
148 <el-row :gutter="10">
140 <el-col :span="8"> 149 <el-col :span="8">
141 <el-form-item label="被担保主债权数额:"> 150 <el-form-item label="被担保主债权数额:">
142 <div class="flex"> 151 <div class="flex">
...@@ -248,7 +257,7 @@ ...@@ -248,7 +257,7 @@
248 抵押人信息 257 抵押人信息
249 <div class="triangle"></div> 258 <div class="triangle"></div>
250 </div> 259 </div>
251 <qlrCommonTable 260 <ywrCommonTable
252 @upDateQlrxxList="upDateYwrxxList" 261 @upDateQlrxxList="upDateYwrxxList"
253 :tableData="ruleForm.ywrList" 262 :tableData="ruleForm.ywrList"
254 :disabled="viewEdit" 263 :disabled="viewEdit"
...@@ -282,6 +291,7 @@ ...@@ -282,6 +291,7 @@
282 <script> 291 <script>
283 import ywmix from "@/views/ywbl/mixin/index"; 292 import ywmix from "@/views/ywbl/mixin/index";
284 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 293 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
294 import ywrCommonTable from "@/views/workflow/components/ywrCommonTable";
285 import { Init, saveData } from "@/api/workflow/ygdyFlow.js"; 295 import { Init, saveData } from "@/api/workflow/ygdyFlow.js";
286 import { mapGetters } from "vuex"; 296 import { mapGetters } from "vuex";
287 export default { 297 export default {
...@@ -311,7 +321,7 @@ ...@@ -311,7 +321,7 @@
311 } 321 }
312 }) 322 })
313 }, 323 },
314 components: { qlrCommonTable }, 324 components: { qlrCommonTable, ywrCommonTable },
315 computed: { 325 computed: {
316 ...mapGetters(["dictData", "flag"]) 326 ...mapGetters(["dictData", "flag"])
317 }, 327 },
......