Merge branch 'dev'

@@ -761,7 +761,7 @@ class data extends filter {
         },
         {
           prop: "bdbzzqse",
-          label: "被担保主债权数额(万元)",
+          label: "被担保主债权数额",
         },
         {
           prop: "dbfw",
@@ -776,7 +776,7 @@ class data extends filter {
           label: "债务履行结束时间",
         },
         {
-          prop: "zwlxqx",
+          prop: "dyqx",
           label: "债务履行期限(债务确定期间)",
         },
         {
@@ -784,7 +784,7 @@ class data extends filter {
           label: "最高债权确定事实和数额",
         },
         {
-          prop: "sfczyd",
+          prop: "sfczjzhxz",
           label: "是否存在禁止或限制转让抵押不动产的约定",
         },
         {
@@ -1017,7 +1017,7 @@ class data extends filter {
           label: "附记",
         },
         {
-          prop: "qdjgmc",
+          prop: "qdjg",
           label: "取得价格/被担保主债权数额",
         },        
         {
@@ -1025,7 +1025,7 @@ class data extends filter {
           label: "担保范围",
         },
         {
-          prop: "sfczyd",
+          prop: "sfczjzhxz",
           label: "是否存在禁止或限制转让抵押不动产的约定",
         },
         {

@@ -171,6 +171,8 @@
         if (['zsdy', 'zmdy'].includes(that.ruleForm.tmpno)) {
           LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4"); // 设置纸张大小为 B4
           LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
+        } else {
+          LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 B4
         }
         LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
         //窗口关闭后，回调函数中保存的设计代码

@@ -100,12 +100,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="面积：">
-              <el-input disabled v-model="ruleForm.ztQlxx.qlmjmc"></el-input>
+            <el-form-item label="权利性质：">
+              <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="用途：">
+            <el-form-item label="权利用途：">
               <el-input disabled v-model="ruleForm.ztQlxx.qlytmc"></el-input>
             </el-form-item>
           </el-col>
@@ -122,7 +122,7 @@
               <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="8">
             <el-form-item label="抵押方式：">
               <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
                 <el-radio label="1">一般抵押权</el-radio>
@@ -130,20 +130,58 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
+            <el-form-item label="抵押面积：">
+              <div class="flex">
+                <el-input
+                  maxlength="12"
+                  v-model="ruleForm.diyaq.dymj"
+                  disabled></el-input>
+                <el-select disabled v-model="ruleForm.diyaq.mjdw" style="width: 68px">
+                  <el-option
+                    v-for="item in dictData['A7']"
+                    :key="item.dcode"
+                    :label="item.dname"
+                    :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
+            </el-form-item>
+          </el-col>
+          </el-row>
+          <el-row :gutter="10">
+          <el-col :span="8">
             <el-form-item
-              label="是否存在禁止或者限制转让抵押不动产的约定："
-              label-width="350px"
+              label="是否禁止或者限制转让的约定："
+              label-width="200px"
             >
               <el-radio-group
                 v-model="ruleForm.diyaq.sfczjzhxz"
                 :disabled="!viewEdit || isJfOperation"
               >
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="0">禁用</el-radio>
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="是否预告登记："
+            >
+              <el-radio-group v-model="ruleForm.diyaq.sfygdj" disabled>
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+           <el-col :span="8">
+            <el-form-item label="债务履行期限：">
+              <el-input
+                v-model="ruleForm.diyaq.dyqx"
+                :disabled="!viewEdit || isJfOperation"
+              ></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="10">
@@ -366,7 +404,6 @@ export default {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;
         this.czrOptions = this.ruleForm.qlrList;
-        this.ruleForm.diyaq.sfczjzhxz = "0";
       }
       this.ruleForm.qlrList.forEach((item) => {
         if (item.sfczr == 1) {

@@ -8,7 +8,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="120px">
+      label-width="140px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           申请业务信息
@@ -59,7 +59,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="不动产登记证明号：">
+            <el-form-item label="不动产证明号：">
               <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
@@ -130,13 +130,22 @@
               <el-input disabled v-model="ruleForm.ygdj.ygdjzlmc"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否存在禁止或限制：">
-              <el-input
+           <el-col :span="8">
+            <el-form-item
+              label="是否禁止或者限制转让的约定："
+              label-width="200px"
+            >
+              <el-radio-group
                 v-model="ruleForm.ygdj.sfczjzhxz"
-                :disabled="ruleForm.sldy.djlx == '300' && !viewEdit"></el-input>
+                :disabled="!viewEdit || isJfOperation"
+              >
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
+          </el-row>
+           <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="被担保主债权数额：">
               <div class="flex">
@@ -248,7 +257,7 @@
           抵押人信息
           <div class="triangle"></div>
         </div>
-        <qlrCommonTable
+        <ywrCommonTable
           @upDateQlrxxList="upDateYwrxxList"
           :tableData="ruleForm.ywrList"
           :disabled="viewEdit"
@@ -282,6 +291,7 @@
 <script>
   import ywmix from "@/views/ywbl/mixin/index";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
+  import ywrCommonTable from "@/views/workflow/components/ywrCommonTable";
   import { Init, saveData } from "@/api/workflow/ygdyFlow.js";
   import { mapGetters } from "vuex";
   export default {
@@ -311,7 +321,7 @@
         }
       })
     },
-    components: { qlrCommonTable },
+    components: { qlrCommonTable, ywrCommonTable },
     computed: {
       ...mapGetters(["dictData", "flag"])
     },